aboutsummaryrefslogtreecommitdiffstats
path: root/Pubnub.py
diff options
context:
space:
mode:
authorDevendra2014-05-07 12:13:17 +0530
committerDevendra2014-05-07 12:13:17 +0530
commit1b49e712e12ba833f460324b95969b162d464edf (patch)
treeaefbb53635e8e3ae60c3892bf5c27eff0175b0f9 /Pubnub.py
parenta38e680ae11453c2f3d5082c2ad39004366a9ad7 (diff)
downloadpubnub-python-1b49e712e12ba833f460324b95969b162d464edf.tar.bz2
console changes and pep8 compliance
Diffstat (limited to 'Pubnub.py')
-rw-r--r--Pubnub.py17
1 files changed, 8 insertions, 9 deletions
diff --git a/Pubnub.py b/Pubnub.py
index a759f75..9cd33af 100644
--- a/Pubnub.py
+++ b/Pubnub.py
@@ -1,5 +1,5 @@
-## www.pubnub.com - PubNub Real-time push service in the cloud.
+## www.pubnub.com - PubNub Real-time push service in the cloud.
# coding=utf8
## PubNub Real-time Push APIs and Notifications Framework
@@ -11,7 +11,6 @@
## -----------------------------------
-
try:
import json
except ImportError:
@@ -96,7 +95,6 @@ try:
def getContext(self, hostname, port):
return ClientContextFactory.getContext(self)
-
class PubNubPamResponse(Protocol):
def __init__(self, finished):
self.finished = finished
@@ -104,7 +102,6 @@ try:
def dataReceived(self, bytes):
self.finished.callback(bytes)
-
class PubNubResponse(Protocol):
def __init__(self, finished):
self.finished = finished
@@ -760,10 +757,10 @@ class PubnubCoreAsync(PubnubBase):
def _invoke(func, msg=None, channel=None):
if func is not None:
if msg is not None and channel is not None:
- func(msg,channel)
+ func(msg, channel)
elif msg is not None:
func(msg)
- else :
+ else:
func()
def _invoke_connect():
@@ -779,7 +776,7 @@ class PubnubCoreAsync(PubnubBase):
if chobj['disconnected'] is True:
chobj['disconnected'] = False
_invoke(chobj['reconnect'], chobj['name'])
-
+
def _invoke_disconnect():
if self._channel_list_lock:
with self._channel_list_lock:
@@ -805,7 +802,8 @@ class PubnubCoreAsync(PubnubBase):
chobj = self.subscriptions[ch]
if chobj['subscribed'] is True:
return chobj
- channels = channels if isinstance(channels,list) else channels.split(",")
+ channels = channels if isinstance(
+ channels, list) else channels.split(",")
for channel in channels:
## New Channel?
if not channel in self.subscriptions or \
@@ -1125,6 +1123,8 @@ def _urllib_request_2(url, timeout=320):
return (resp.read(), resp.code)
s = requests.Session()
+
+
def _requests_request(url, timeout=320):
try:
resp = s.get(url, timeout=timeout)
@@ -1370,7 +1370,6 @@ class PubnubTwisted(PubnubCoreAsync):
return abort
-
# PubnubTornado
class PubnubTornado(PubnubCoreAsync):