aboutsummaryrefslogtreecommitdiffstats
path: root/python
diff options
context:
space:
mode:
Diffstat (limited to 'python')
-rw-r--r--python/Pubnub.py521
-rwxr-xr-xpython/examples/dev-console.py106
-rw-r--r--python/examples/here-now-example.py26
-rwxr-xr-xpython/examples/history-example.py7
-rwxr-xr-xpython/examples/publish-example.py52
-rwxr-xr-xpython/examples/subscribe-example.py34
-rwxr-xr-xpython/tests/subscribe-test.py90
-rwxr-xr-xpython/tests/unit-test.py38
-rw-r--r--python/unassembled/Platform.py86
9 files changed, 522 insertions, 438 deletions
diff --git a/python/Pubnub.py b/python/Pubnub.py
index 230915c..93f416b 100644
--- a/python/Pubnub.py
+++ b/python/Pubnub.py
@@ -12,11 +12,12 @@
from Crypto.Cipher import AES
from Crypto.Hash import MD5
-from base64 import encodestring, decodestring
+from base64 import encodestring, decodestring
import hashlib
import hmac
-class PubnubCrypto2() :
+
+class PubnubCrypto2():
"""
#**
#* PubnubCrypto
@@ -27,8 +28,8 @@ class PubnubCrypto2() :
pc = PubnubCrypto
"""
-
- def pad( self, msg, block_size=16 ):
+
+ def pad(self, msg, block_size=16):
"""
#**
#* pad
@@ -40,9 +41,9 @@ class PubnubCrypto2() :
#**
"""
padding = block_size - (len(msg) % block_size)
- return msg + chr(padding)*padding
-
- def depad( self, msg ):
+ return msg + chr(padding) * padding
+
+ def depad(self, msg):
"""
#**
#* depad
@@ -53,7 +54,7 @@ class PubnubCrypto2() :
"""
return msg[0:-ord(msg[-1])]
- def getSecret( self, key ):
+ def getSecret(self, key):
"""
#**
#* getSecret
@@ -64,7 +65,7 @@ class PubnubCrypto2() :
"""
return hashlib.sha256(key).hexdigest()
- def encrypt( self, key, msg ):
+ def encrypt(self, key, msg):
"""
#**
#* encrypt
@@ -74,11 +75,12 @@ class PubnubCrypto2() :
#**
"""
secret = self.getSecret(key)
- Initial16bytes='0123456789012345'
- cipher = AES.new(secret[0:32],AES.MODE_CBC,Initial16bytes)
+ Initial16bytes = '0123456789012345'
+ cipher = AES.new(secret[0:32], AES.MODE_CBC, Initial16bytes)
enc = encodestring(cipher.encrypt(self.pad(msg)))
return enc
- def decrypt( self, key, msg ):
+
+ def decrypt(self, key, msg):
"""
#**
#* decrypt
@@ -88,12 +90,12 @@ class PubnubCrypto2() :
#**
"""
secret = self.getSecret(key)
- Initial16bytes='0123456789012345'
- cipher = AES.new(secret[0:32],AES.MODE_CBC,Initial16bytes)
+ Initial16bytes = '0123456789012345'
+ cipher = AES.new(secret[0:32], AES.MODE_CBC, Initial16bytes)
return self.depad((cipher.decrypt(decodestring(msg))))
-class PubnubCrypto3() :
+class PubnubCrypto3():
"""
#**
#* PubnubCrypto
@@ -104,8 +106,8 @@ class PubnubCrypto3() :
pc = PubnubCrypto
"""
-
- def pad( self, msg, block_size=16 ):
+
+ def pad(self, msg, block_size=16):
"""
#**
#* pad
@@ -117,9 +119,9 @@ class PubnubCrypto3() :
#**
"""
padding = block_size - (len(msg) % block_size)
- return msg + (chr(padding)*padding).encode('utf-8')
-
- def depad( self, msg ):
+ return msg + (chr(padding) * padding).encode('utf-8')
+
+ def depad(self, msg):
"""
#**
#* depad
@@ -130,7 +132,7 @@ class PubnubCrypto3() :
"""
return msg[0:-ord(msg[-1])]
- def getSecret( self, key ):
+ def getSecret(self, key):
"""
#**
#* getSecret
@@ -141,7 +143,7 @@ class PubnubCrypto3() :
"""
return hashlib.sha256(key.encode("utf-8")).hexdigest()
- def encrypt( self, key, msg ):
+ def encrypt(self, key, msg):
"""
#**
#* encrypt
@@ -151,10 +153,12 @@ class PubnubCrypto3() :
#**
"""
secret = self.getSecret(key)
- Initial16bytes='0123456789012345'
- cipher = AES.new(secret[0:32],AES.MODE_CBC,Initial16bytes)
- return encodestring(cipher.encrypt(self.pad(msg.encode('utf-8')))).decode('utf-8')
- def decrypt( self, key, msg ):
+ Initial16bytes = '0123456789012345'
+ cipher = AES.new(secret[0:32], AES.MODE_CBC, Initial16bytes)
+ return encodestring(
+ cipher.encrypt(self.pad(msg.encode('utf-8')))).decode('utf-8')
+
+ def decrypt(self, key, msg):
"""
#**
#* decrypt
@@ -164,40 +168,46 @@ class PubnubCrypto3() :
#**
"""
secret = self.getSecret(key)
- Initial16bytes='0123456789012345'
- cipher = AES.new(secret[0:32],AES.MODE_CBC,Initial16bytes)
- return (cipher.decrypt(decodestring(msg.encode('utf-8')))).decode('utf-8')
+ Initial16bytes = '0123456789012345'
+ cipher = AES.new(secret[0:32], AES.MODE_CBC, Initial16bytes)
+ return (cipher.decrypt(
+ decodestring(msg.encode('utf-8')))).decode('utf-8')
-try: import json
-except ImportError: import simplejson as json
+try:
+ import json
+except ImportError:
+ import simplejson as json
import time
import hashlib
import uuid
import sys
-try: from urllib.parse import quote
-except: from urllib2 import quote
+try:
+ from urllib.parse import quote
+except:
+ from urllib2 import quote
-from base64 import urlsafe_b64encode
+from base64 import urlsafe_b64encode
from hashlib import sha256
import hmac
+
class PubnubBase(object):
def __init__(
self,
publish_key,
subscribe_key,
- secret_key = False,
- cipher_key = False,
- auth_key = None,
- ssl_on = False,
- origin = 'pubsub.pubnub.com',
- UUID = None
- ) :
+ secret_key=False,
+ cipher_key=False,
+ auth_key=None,
+ ssl_on=False,
+ origin='pubsub.pubnub.com',
+ UUID=None
+ ):
"""
#**
#* Pubnub
@@ -209,41 +219,41 @@ class PubnubBase(object):
#* @param string secret_key optional key to sign messages.
#* @param boolean ssl required for 2048 bit encrypted messages.
#* @param string origin PUBNUB Server Origin.
- #* @param string pres_uuid optional identifier for presence (auto-generated if not supplied)
+ #* @param string pres_uuid optional identifier
+ #* for presence (auto-generated if not supplied)
#**
## Initiat Class
pubnub = Pubnub( 'PUBLISH-KEY', 'SUBSCRIBE-KEY', 'SECRET-KEY', False )
"""
- self.origin = origin
- self.limit = 1800
- self.publish_key = publish_key
+ self.origin = origin
+ self.limit = 1800
+ self.publish_key = publish_key
self.subscribe_key = subscribe_key
- self.secret_key = secret_key
- self.cipher_key = cipher_key
- self.ssl = ssl_on
- self.auth_key = auth_key
+ self.secret_key = secret_key
+ self.cipher_key = cipher_key
+ self.ssl = ssl_on
+ self.auth_key = auth_key
-
- if self.ssl :
+ if self.ssl:
self.origin = 'https://' + self.origin
- else :
- self.origin = 'http://' + self.origin
-
+ else:
+ self.origin = 'http://' + self.origin
+
self.uuid = UUID or str(uuid.uuid4())
if type(sys.version_info) is tuple:
- self.python_version = 2
- self.pc = PubnubCrypto2()
+ self.python_version = 2
+ self.pc = PubnubCrypto2()
else:
if sys.version_info.major == 2:
- self.python_version = 2
- self.pc = PubnubCrypto2()
+ self.python_version = 2
+ self.pc = PubnubCrypto2()
else:
self.python_version = 3
- self.pc = PubnubCrypto3()
-
+ self.pc = PubnubCrypto3()
+
if not isinstance(self.uuid, str):
raise AttributeError("pres_uuid must be a string")
@@ -264,7 +274,7 @@ class PubnubBase(object):
return signature
'''
- def _pam_sign( self, msg ):
+ def _pam_sign(self, msg):
"""Calculate a signature by secret key and message."""
return urlsafe_b64encode(hmac.new(
@@ -273,7 +283,7 @@ class PubnubBase(object):
sha256
).digest())
- def _pam_auth( self, query , apicode=0, callback=None):
+ def _pam_auth(self, query, apicode=0, callback=None):
"""Issue an authenticated request."""
if 'timestamp' not in query:
@@ -300,57 +310,50 @@ class PubnubBase(object):
query['signature'] = self._pam_sign(sign_input)
- '''
- url = ("https://pubsub.pubnub.com/v1/auth/{apitype}/sub-key/".format(apitype="audit" if (apicode) else "grant") +
- self.subscribe_key + "?" +
- params + "&signature=" +
- quote(signature, safe=""))
- '''
-
return self._request({"urlcomponents": [
- 'v1', 'auth', "audit" if (apicode) else "grant" ,
+ 'v1', 'auth', "audit" if (apicode) else "grant",
'sub-key',
self.subscribe_key
- ], 'urlparams' : query},
- self._return_wrapped_callback(callback))
+ ], 'urlparams': query},
+ self._return_wrapped_callback(callback))
- def grant( self, channel, authkey=False, read=True, write=True, ttl=5, callback=None):
+ def grant(self, channel, authkey=False, read=True,
+ write=True, ttl=5, callback=None):
"""Grant Access on a Channel."""
return self._pam_auth({
- "channel" : channel,
- "auth" : authkey,
- "r" : read and 1 or 0,
- "w" : write and 1 or 0,
- "ttl" : ttl
+ "channel": channel,
+ "auth": authkey,
+ "r": read and 1 or 0,
+ "w": write and 1 or 0,
+ "ttl": ttl
}, callback=callback)
- def revoke( self, channel, authkey=False, ttl=1, callback=None):
+ def revoke(self, channel, authkey=False, ttl=1, callback=None):
"""Revoke Access on a Channel."""
return self._pam_auth({
- "channel" : channel,
- "auth" : authkey,
- "r" : 0,
- "w" : 0,
- "ttl" : ttl
+ "channel": channel,
+ "auth": authkey,
+ "r": 0,
+ "w": 0,
+ "ttl": ttl
}, callback=callback)
def audit(self, channel=False, authkey=False, callback=None):
return self._pam_auth({
- "channel" : channel,
- "auth" : authkey
- },1, callback=callback)
-
-
+ "channel": channel,
+ "auth": authkey
+ }, 1, callback=callback)
def encrypt(self, message):
if self.cipher_key:
- message = json.dumps(self.pc.encrypt(self.cipher_key, json.dumps(message)).replace('\n',''))
- else :
+ message = json.dumps(self.pc.encrypt(
+ self.cipher_key, json.dumps(message)).replace('\n', ''))
+ else:
message = json.dumps(message)
- return message;
+ return message
def decrypt(self, message):
if self.cipher_key:
@@ -361,15 +364,17 @@ class PubnubBase(object):
def _return_wrapped_callback(self, callback=None):
def _new_format_callback(response):
if 'payload' in response:
- if (callback != None): callback({'message' : response['message'], 'payload' : response['payload']})
+ if (callback is not None):
+ callback({'message': response['message'],
+ 'payload': response['payload']})
else:
- if (callback != None):callback(response)
- if (callback != None):
+ if (callback is not None):
+ callback(response)
+ if (callback is not None):
return _new_format_callback
else:
return None
-
def publish(channel, message, callback=None, error=None):
"""
#**
@@ -403,10 +408,11 @@ class PubnubBase(object):
channel,
'0',
message
- ], 'urlparams' : {'auth' : self.auth_key}}, callback=self._return_wrapped_callback(callback),
- error=self._return_wrapped_callback(error))
-
- def presence( self, channel, callback, error=None) :
+ ], 'urlparams': {'auth': self.auth_key}},
+ callback=self._return_wrapped_callback(callback),
+ error=self._return_wrapped_callback(error))
+
+ def presence(self, channel, callback, error=None):
"""
#**
#* presence
@@ -425,13 +431,15 @@ class PubnubBase(object):
pubnub.presence({
'channel' : 'hello_world',
- 'callback' : receive
+ 'callback' : receive
})
"""
- return self.subscribe({'channel': channel+'-pnpres', 'subscribe_key':self.subscribe_key, 'callback': self._return_wrapped_callback(callback)})
-
-
- def here_now( self, channel, callback, error=None) :
+ return self.subscribe({
+ 'channel': channel + '-pnpres',
+ 'subscribe_key': self.subscribe_key,
+ 'callback': self._return_wrapped_callback(callback)})
+
+ def here_now(self, channel, callback, error=None):
"""
#**
#* Here Now
@@ -452,33 +460,31 @@ class PubnubBase(object):
"""
channel = str(args['channel'])
-
- callback = args['callback'] if 'callback' in args else None
- error = args['error'] if 'error' in args else None
+ callback = args['callback'] if 'callback' in args else None
+ error = args['error'] if 'error' in args else None
## Fail if bad input.
- if not channel :
+ if not channel:
raise Exception('Missing Channel')
return False
-
+
## Get Presence Here Now
return self._request({"urlcomponents": [
- 'v2','presence',
+ 'v2', 'presence',
'sub_key', self.subscribe_key,
'channel', channel
- ], 'urlparams' : {'auth' : self.auth_key}}, callback=self._return_wrapped_callback(callback),
- error=self._return_wrapped_callback(error))
+ ], 'urlparams': {'auth': self.auth_key}},
+ callback=self._return_wrapped_callback(callback),
+ error=self._return_wrapped_callback(error))
- def history(self, channel, count=100, reverse=False, start=None, end=None, callback=None, error=None) :
+ def history(self, channel, count=100, reverse=False,
+ start=None, end=None, callback=None, error=None):
"""
#**
#* History
#*
#* Load history from a channel.
#*
- #* @param array args with 'channel', optional: 'start', 'end', 'reverse', 'count'
- #* @return mixed false on fail, array on success.
- #*
## History Example
history = pubnub.detailedHistory({
@@ -489,25 +495,26 @@ class PubnubBase(object):
"""
- params = dict()
+ params = dict()
- params['count'] = count
- params['reverse'] = reverse
- params['start'] = start
- params['end'] = end
+ params['count'] = count
+ params['reverse'] = reverse
+ params['start'] = start
+ params['end'] = end
## Get History
- return self._request({ 'urlcomponents' : [
+ return self._request({'urlcomponents': [
'v2',
'history',
'sub-key',
self.subscribe_key,
'channel',
channel,
- ], 'urlparams' : {'auth' : self.auth_key}}, callback=self._return_wrapped_callback(callback),
- error=self._return_wrapped_callback(error))
+ ], 'urlparams': {'auth': self.auth_key}},
+ callback=self._return_wrapped_callback(callback),
+ error=self._return_wrapped_callback(error))
- def time(self,callback=None) :
+ def time(self, callback=None):
"""
#**
#* Time
@@ -523,30 +530,30 @@ class PubnubBase(object):
"""
- time = self._request({'urlcomponents' : [
+ time = self._request({'urlcomponents': [
'time',
'0'
]}, callback)
- if time != None:
+ if time is not None:
return time[0]
-
- def _encode( self, request ) :
+ def _encode(self, request):
return [
- "".join([ ' ~`!@#$%^&*()+=[]\\{}|;\':",./<>?'.find(ch) > -1 and
- hex(ord(ch)).replace( '0x', '%' ).upper() or
- ch for ch in list(bit)
- ]) for bit in request]
-
- def getUrl(self,request):
+ "".join([' ~`!@#$%^&*()+=[]\\{}|;\':",./<>?'.find(ch) > -1 and
+ hex(ord(ch)).replace('0x', '%').upper() or
+ ch for ch in list(bit)
+ ]) for bit in request]
+
+ def getUrl(self, request):
## Build URL
url = self.origin + '/' + "/".join([
- "".join([ ' ~`!@#$%^&*()+=[]\\{}|;\':",./<>?'.find(ch) > -1 and
- hex(ord(ch)).replace( '0x', '%' ).upper() or
- ch for ch in list(bit)
- ]) for bit in request["urlcomponents"]])
+ "".join([' ~`!@#$%^&*()+=[]\\{}|;\':",./<>?'.find(ch) > -1 and
+ hex(ord(ch)).replace('0x', '%').upper() or
+ ch for ch in list(bit)
+ ]) for bit in request["urlcomponents"]])
if ("urlparams" in request):
- url = url + '?' + "&".join([ x + "=" + str(y) for x,y in request["urlparams"].items() if y is not None])
+ url = url + '?' + "&".join([x + "=" + str(y) for x, y in request[
+ "urlparams"].items() if y is not None])
return url
@@ -558,32 +565,38 @@ except ImportError:
sha256 = digestmod.new
import hmac
+
class EmptyLock():
def __enter__(self):
pass
- def __exit__(self,a,b,c):
+
+ def __exit__(self, a, b, c):
pass
empty_lock = EmptyLock()
+
class PubnubCoreAsync(PubnubBase):
- def start(self): pass
- def stop(self): pass
+ def start(self):
+ pass
+
+ def stop(self):
+ pass
def __init__(
self,
publish_key,
subscribe_key,
- secret_key = False,
- cipher_key = False,
- auth_key = None,
- ssl_on = False,
- origin = 'pubsub.pubnub.com',
- uuid = None,
+ secret_key=False,
+ cipher_key=False,
+ auth_key=None,
+ ssl_on=False,
+ origin='pubsub.pubnub.com',
+ uuid=None,
_tt_lock=empty_lock,
_channel_list_lock=empty_lock
- ) :
+ ):
"""
#**
#* Pubnub
@@ -610,18 +623,18 @@ class PubnubCoreAsync(PubnubBase):
ssl_on=ssl_on,
origin=origin,
UUID=uuid
- )
-
- self.subscriptions = {}
- self.timetoken = 0
- self.last_timetoken = 0
- self.version = '3.3.4'
- self.accept_encoding = 'gzip'
- self.SUB_RECEIVER = None
- self._connect = None
- self._tt_lock = _tt_lock
- self._channel_list_lock = _channel_list_lock
- self._connect = lambda: None
+ )
+
+ self.subscriptions = {}
+ self.timetoken = 0
+ self.last_timetoken = 0
+ self.version = '3.3.4'
+ self.accept_encoding = 'gzip'
+ self.SUB_RECEIVER = None
+ self._connect = None
+ self._tt_lock = _tt_lock
+ self._channel_list_lock = _channel_list_lock
+ self._connect = lambda: None
def get_channel_list(self, channels):
channel = ''
@@ -653,7 +666,8 @@ class PubnubCoreAsync(PubnubBase):
for i in l:
func(i)
- def subscribe( self, channel, callback, error=None, connect=None, disconnect=None, reconnect=None, sync=False ) :
+ def subscribe(self, channel, callback, error=None,
+ connect=None, disconnect=None, reconnect=None, sync=False):
"""
#**
#* Subscribe
@@ -687,14 +701,15 @@ class PubnubCoreAsync(PubnubBase):
"""
with self._tt_lock:
- self.last_timetoken = self.timetoken if self.timetoken != 0 else self.last_timetoken
+ self.last_timetoken = self.timetoken if self.timetoken != 0 \
+ else self.last_timetoken
self.timetoken = 0
if sync is True and self.susbcribe_sync is not None:
self.susbcribe_sync(args)
return
- def _invoke(func,msg=None):
+ def _invoke(func, msg=None):
if func is not None:
if msg is not None:
func(msg)
@@ -708,17 +723,17 @@ class PubnubCoreAsync(PubnubBase):
chobj = self.subscriptions[ch]
if chobj['connected'] is False:
chobj['connected'] = True
- _invoke(chobj['connect'],chobj['name'])
+ _invoke(chobj['connect'], chobj['name'])
def _invoke_error(channel_list=None, err=None):
if channel_list is None:
for ch in self.subscriptions:
chobj = self.subscriptions[ch]
- _invoke(chobj['error'],err)
+ _invoke(chobj['error'], err)
else:
for ch in channel_list:
chobj = self.subscriptions[ch]
- _invoke(chobj['error'],err)
+ _invoke(chobj['error'], err)
def _get_channel():
for ch in self.subscriptions:
@@ -726,53 +741,58 @@ class PubnubCoreAsync(PubnubBase):
if chobj['subscribed'] is True:
return chobj
-
## New Channel?
- if not channel in self.subscriptions or self.subscriptions[channel]['subscribed'] is False:
- with self._channel_list_lock:
- self.subscriptions[channel] = {
- 'name' : channel,
- 'first' : False,
- 'connected' : False,
- 'subscribed' : True,
- 'callback' : callback,
- 'connect' : connect,
- 'disconnect' : disconnect,
- 'reconnect' : reconnect,
- 'error' : error
- }
-
+ if not channel in self.subscriptions or \
+ self.subscriptions[channel]['subscribed'] is False:
+ with self._channel_list_lock:
+ self.subscriptions[channel] = {
+ 'name': channel,
+ 'first': False,
+ 'connected': False,
+ 'subscribed': True,
+ 'callback': callback,
+ 'connect': connect,
+ 'disconnect': disconnect,
+ 'reconnect': reconnect,
+ 'error': error
+ }
## return if already connected to channel
- if channel in self.subscriptions and 'connected' in self.subscriptions[channel] and self.subscriptions[channel]['connected'] is True:
- _invoke(error, "Already Connected")
- return
-
-
+ if channel in self.subscriptions and \
+ 'connected' in self.subscriptions[channel] and \
+ self.subscriptions[channel]['connected'] is True:
+ _invoke(error, "Already Connected")
+ return
- ## SUBSCRIPTION RECURSION
+ ## SUBSCRIPTION RECURSION
def _connect():
-
+
self._reset_offline()
def sub_callback(response):
## ERROR ?
- if not response or ('message' in response and response['message'] == 'Forbidden'):
- _invoke_error(response['payload']['channels'], response['message'])
- _connect()
- return
+ if not response or \
+ ('message' in response and
+ response['message'] == 'Forbidden'):
+ _invoke_error(response['payload'][
+ 'channels'], response['message'])
+ _connect()
+ return
_invoke_connect()
with self._tt_lock:
- self.timetoken = self.last_timetoken if self.timetoken == 0 and self.last_timetoken != 0 else response[1]
+ self.timetoken = \
+ self.last_timetoken if self.timetoken == 0 and \
+ self.last_timetoken != 0 else response[1]
if len(response) > 2:
channel_list = response[2].split(',')
response_list = response[0]
for ch in enumerate(channel_list):
if ch[1] in self.subscriptions:
chobj = self.subscriptions[ch[1]]
- _invoke(chobj['callback'],self.decrypt(response_list[ch[0]]))
+ _invoke(chobj['callback'],
+ self.decrypt(response_list[ch[0]]))
else:
response_list = response[0]
chobj = _get_channel()
@@ -782,23 +802,25 @@ class PubnubCoreAsync(PubnubBase):
_connect()
-
channel_list = self.get_channel_list(self.subscriptions)
if len(channel_list) <= 0:
return
## CONNECT TO PUBNUB SUBSCRIBE SERVERS
try:
- self.SUB_RECEIVER = self._request( { "urlcomponents" : [
+ self.SUB_RECEIVER = self._request({"urlcomponents": [
'subscribe',
self.subscribe_key,
channel_list,
'0',
str(self.timetoken)
- ], "urlparams" : {"uuid":self.uuid, "auth" : self.auth_key} }, sub_callback, sub_callback, single=True )
+ ], "urlparams": {"uuid": self.uuid, "auth": self.auth_key}},
+ sub_callback,
+ sub_callback,
+ single=True)
except Exception as e:
print(e)
- self.timeout( 1, _connect)
+ self.timeout(1, _connect)
return
self._connect = _connect
@@ -815,8 +837,7 @@ class PubnubCoreAsync(PubnubBase):
self._reset_offline()
self._connect()
-
- def unsubscribe( self, channel ):
+ def unsubscribe(self, channel):
if channel in self.subscriptions is False:
return False
@@ -824,10 +845,10 @@ class PubnubCoreAsync(PubnubBase):
## DISCONNECT
with self._channel_list_lock:
if channel in self.subscriptions:
- self.subscriptions[channel]['connected'] = 0
- self.subscriptions[channel]['subscribed'] = False
- self.subscriptions[channel]['timetoken'] = 0
- self.subscriptions[channel]['first'] = False
+ self.subscriptions[channel]['connected'] = 0
+ self.subscriptions[channel]['subscribed'] = False
+ self.subscriptions[channel]['timetoken'] = 0
+ self.subscriptions[channel]['first'] = False
self.CONNECT()
@@ -843,13 +864,12 @@ import threading
from threading import current_thread
latest_sub_callback_lock = threading.RLock()
-latest_sub_callback = {'id' : None, 'callback' : None}
-
-
+latest_sub_callback = {'id': None, 'callback': None}
class HTTPClient:
- def __init__(self, url, urllib_func=None, callback=None, error=None, id=None):
+ def __init__(self, url, urllib_func=None,
+ callback=None, error=None, id=None):
self.url = url
self.id = id
self.callback = callback
@@ -862,7 +882,6 @@ class HTTPClient:
self.callback = None
self.error = None
-
def run(self):
def _invoke(func, data):
@@ -896,65 +915,68 @@ class HTTPClient:
try:
data = json.loads(data)
except:
- _invoke(latest_sub_callback['error'], {'error' : 'json decoding error'})
+ _invoke(latest_sub_callback['error'],
+ {'error': 'json decoding error'})
return
if code != 200:
- _invoke(latest_sub_callback['error'],data)
+ _invoke(latest_sub_callback['error'], data)
else:
- _invoke(latest_sub_callback['callback'],data)
+ _invoke(latest_sub_callback['callback'], data)
else:
try:
data = json.loads(data)
except:
- _invoke(self.error, {'error' : 'json decoding error'})
+ _invoke(self.error, {'error': 'json decoding error'})
return
if code != 200:
- _invoke(self.error,data)
+ _invoke(self.error, data)
else:
- _invoke(self.callback,data)
+ _invoke(self.callback, data)
def _urllib_request_2(url, timeout=320):
try:
- resp = urllib2.urlopen(url,timeout=timeout)
+ resp = urllib2.urlopen(url, timeout=timeout)
except urllib2.HTTPError as http_error:
resp = http_error
- return (resp.read(),resp.code)
+ return (resp.read(), resp.code)
+
def _urllib_request_3(url, timeout=320):
#print(url)
try:
- resp = urllib.request.urlopen(url,timeout=timeout)
+ resp = urllib.request.urlopen(url, timeout=timeout)
except urllib.request.HTTPError as http_error:
resp = http_error
- r = resp.read().decode("utf-8")
+ r = resp.read().decode("utf-8")
#print(r)
- return (r,resp.code)
+ return (r, resp.code)
_urllib_request = None
+
class Pubnub(PubnubCoreAsync):
def __init__(
self,
publish_key,
subscribe_key,
- secret_key = False,
- cipher_key = False,
- auth_key = None,
- ssl_on = False,
- origin = 'pubsub.pubnub.com',
- pres_uuid = None
- ) :
+ secret_key=False,
+ cipher_key=False,
+ auth_key=None,
+ ssl_on=False,
+ origin='pubsub.pubnub.com',
+ pres_uuid=None
+ ):
super(Pubnub, self).__init__(
- publish_key = publish_key,
- subscribe_key = subscribe_key,
- secret_key = secret_key,
- cipher_key = cipher_key,
- auth_key = auth_key,
- ssl_on = ssl_on,
- origin = origin,
- uuid = pres_uuid,
+ publish_key=publish_key,
+ subscribe_key=subscribe_key,
+ secret_key=secret_key,
+ cipher_key=cipher_key,
+ auth_key=auth_key,
+ ssl_on=ssl_on,
+ origin=origin,
+ uuid=pres_uuid,
_tt_lock=threading.RLock(),
_channel_list_lock=threading.RLock()
)
@@ -971,29 +993,30 @@ class Pubnub(PubnubCoreAsync):
thread = threading.Thread(target=cb)
thread.start()
-
- def _request_async( self, request, callback=None, error=None, single=False ) :
+ def _request_async(self, request, callback=None, error=None, single=False):
global _urllib_request
## Build URL
url = self.getUrl(request)
if single is True:
id = time.time()
- client = HTTPClient(url=url, urllib_func=_urllib_request, callback=None, error=None, id=id)
+ client = HTTPClient(url=url, urllib_func=_urllib_request,
+ callback=None, error=None, id=id)
with latest_sub_callback_lock:
latest_sub_callback['id'] = id
latest_sub_callback['callback'] = callback
latest_sub_callback['error'] = error
else:
- client = HTTPClient(url=url, urllib_func=_urllib_request, callback=callback, error=error)
+ client = HTTPClient(url=url, urllib_func=_urllib_request,
+ callback=callback, error=error)
thread = threading.Thread(target=client.run)
thread.start()
+
def abort():
- client.cancel();
+ client.cancel()
return abort
-
- def _request_sync( self, request) :
+ def _request_sync(self, request):
global _urllib_request
## Build URL
url = self.getUrl(request)
@@ -1002,14 +1025,14 @@ class Pubnub(PubnubCoreAsync):
try:
resp_json = json.loads(response[0])
except:
- return [0,"JSON Error"]
+ return [0, "JSON Error"]
if response[1] != 200 and 'status' in resp_json:
- return {'message' : resp_json['message'], 'payload' : resp_json['payload']}
+ return {'message': resp_json['message'],
+ 'payload': resp_json['payload']}
return resp_json
-
def _request(self, request, callback=None, error=None, single=False):
if callback is None:
return self._request_sync(request)
@@ -1027,7 +1050,7 @@ class Pubnub(PubnubCoreAsync):
resp_json = json.loads(response.read().decode("utf-8"))
except Exception as e:
return None
-
+
return resp_json
def _request3_async( self, request, callback, single=False ) :
diff --git a/python/examples/dev-console.py b/python/examples/dev-console.py
index 383fa68..7814cef 100755
--- a/python/examples/dev-console.py
+++ b/python/examples/dev-console.py
@@ -1,4 +1,4 @@
-## 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
@@ -55,41 +55,55 @@ parser.add_option("--uuid",
print(options)
-pubnub = Pubnub(options.publish_key, options.subscribe_key, options.secret_key, options.cipher_key, options.auth_key, options.ssl, options.origin, options.uuid)
+pubnub = Pubnub(options.publish_key,
+ options.subscribe_key,
+ options.secret_key,
+ options.cipher_key,
+ options.auth_key,
+ options.ssl,
+ options.origin,
+ options.uuid)
class color:
- PURPLE = '\033[95m'
- CYAN = '\033[96m'
- DARKCYAN = '\033[36m'
- BLUE = '\033[94m'
- GREEN = '\033[92m'
- YELLOW = '\033[93m'
- RED = '\033[91m'
- BOLD = '\033[1m'
- UNDERLINE = '\033[4m'
- END = '\033[0m'
+ PURPLE = '\033[95m'
+ CYAN = '\033[96m'
+ DARKCYAN = '\033[36m'
+ BLUE = '\033[94m'
+ GREEN = '\033[92m'
+ YELLOW = '\033[93m'
+ RED = '\033[91m'
+ BOLD = '\033[1m'
+ UNDERLINE = '\033[4m'
+ END = '\033[0m'
from datetime import datetime
+
def print_ok(msg, channel=None):
- chstr = color.PURPLE + "[" + datetime.now().strftime('%Y-%m-%d %H:%M:%S') + "] " + color.END
- chstr += color.CYAN + "[Channel : " + channel + "] " if channel is not None else "" + color.END
+ chstr = color.PURPLE + "[" + datetime.now().strftime(
+ '%Y-%m-%d %H:%M:%S') + "] " + color.END
+ chstr += color.CYAN + "[Channel : " + channel + \
+ "] " if channel is not None else "" + color.END
try:
- print(chstr + color.GREEN + str(msg) + color.END)
+ print(chstr + color.GREEN + str(msg) + color.END)
except Exception as e:
print(msg)
+
def print_error(msg, channel=None):
- chstr = color.PURPLE + "[" + datetime.now().strftime('%Y-%m-%d %H:%M:%S') + "] " + color.END
- chstr += color.CYAN + "[Channel : " + channel + "] " if channel is not None else "" + color.END
+ chstr = color.PURPLE + "[" + datetime.now().strftime(
+ '%Y-%m-%d %H:%M:%S') + "] " + color.END
+ chstr += color.CYAN + "[Channel : " + channel + \
+ "] " if channel is not None else "" + color.END
try:
- print( chstr + color.RED + color.BOLD +str(msg) + color.END)
+ print(chstr + color.RED + color.BOLD + str(msg) + color.END)
except:
print(msg)
import threading
+
def kill_all_threads():
for thread in threading.enumerate():
if thread.isAlive():
@@ -101,6 +115,7 @@ def kill_all_threads():
#thread.exit()
#print(str(thread.getName()) + ' could not be terminated')
+
def get_input(message, t=None):
while True:
try:
@@ -117,7 +132,8 @@ def get_input(message, t=None):
raise ValueError
if t is not None and t == bool:
- if command in ["True", "true", "1", 1, "y", "Y", "yes", "Yes", "YES"]:
+ valid = ["True", "true", "1", 1, "y", "Y", "yes", "Yes", "YES"]
+ if command in valid:
return True
else:
return False
@@ -131,18 +147,20 @@ def get_input(message, t=None):
print_error("Invalid input : " + command)
-
def _publish_command_handler():
channel = get_input("[PUBLISH] Enter Channel Name ", str)
if channel is None:
return
while True:
- message = get_input("[PUBLISH] Enter Message ( QUIT or CTRL-C for exit from publish mode ) ")
- if message == 'QUIT' or message == 'quit' or message == None:
- return
+ message = get_input("[PUBLISH] Enter Message \
+ ( QUIT or CTRL-C for exit from publish mode ) ")
+ if message == 'QUIT' or message == 'quit' or message is None:
+ return
+
def _callback(r):
print_ok(r)
+
def _error(r):
print_error(r)
pubnub.publish(channel, message, _callback, _error)
@@ -150,23 +168,30 @@ def _publish_command_handler():
def _subscribe_command_handler():
channel = get_input("[SUBSCRIBE] Enter Channel Name ", str)
+
def _callback(r):
print_ok(r, channel)
+
def _error(r):
print_error(r, channel)
pubnub.subscribe(channel, _callback, _error)
+
def _unsubscribe_command_handler():
channel = get_input("[UNSUBSCRIBE] Enter Channel Name ", str)
+
def _callback(r):
print_ok(r)
+
def _error(r):
print_error(r)
pubnub.unsubscribe(channel)
+
def _grant_command_handler():
def _callback(r):
print_ok(r)
+
def _error(r):
print_error(r)
channel = get_input("[GRANT] Enter Channel Name ", str)
@@ -174,11 +199,13 @@ def _grant_command_handler():
ttl = get_input("[GRANT] Enter ttl ", int)
read = get_input("[GRANT] Read ? ", bool)
write = get_input("[GRANT] Write ? ", bool)
- pubnub.grant(channel, auth_key,read,write,ttl, _callback)
+ pubnub.grant(channel, auth_key, read, write, ttl, _callback)
+
def _revoke_command_handler():
def _callback(r):
print_ok(r)
+
def _error(r):
print_error(r)
channel = get_input("[REVOKE] Enter Channel Name ", str)
@@ -187,18 +214,22 @@ def _revoke_command_handler():
pubnub.revoke(channel, auth_key, ttl, _callback)
+
def _audit_command_handler():
def _callback(r):
print_ok(r)
+
def _error(r):
print_error(r)
channel = get_input("[AUDIT] Enter Channel Name ", str)
auth_key = get_input("[AUDIT] Enter Auth Key ", str)
pubnub.audit(channel, auth_key, _callback)
+
def _history_command_handler():
def _callback(r):
print_ok(r)
+
def _error(r):
print_error(r)
channel = get_input("[HISTORY] Enter Channel Name ", str)
@@ -210,6 +241,7 @@ def _history_command_handler():
def _here_now_command_handler():
def _callback(r):
print_ok(r)
+
def _error(r):
print_error(r)
channel = get_input("[HERE NOW] Enter Channel Name ", str)
@@ -218,28 +250,32 @@ def _here_now_command_handler():
commands = []
-commands.append({"command" : "publish", "handler" : _publish_command_handler})
-commands.append({"command" : "subscribe", "handler" : _subscribe_command_handler})
-commands.append({"command" : "unsubscribe", "handler" : _unsubscribe_command_handler})
-commands.append({"command" : "here_now", "handler" : _here_now_command_handler})
-commands.append({"command" : "history", "handler" : _history_command_handler})
-commands.append({"command" : "grant", "handler" : _grant_command_handler})
-commands.append({"command" : "revoke", "handler" : _revoke_command_handler})
-commands.append({"command" : "audit", "handler" : _audit_command_handler})
+commands.append({"command": "publish", "handler": _publish_command_handler})
+commands.append(
+ {"command": "subscribe", "handler": _subscribe_command_handler})
+commands.append(
+ {"command": "unsubscribe", "handler": _unsubscribe_command_handler})
+commands.append(
+ {"command": "here_now", "handler": _here_now_command_handler})
+commands.append({"command": "history", "handler": _history_command_handler})
+commands.append({"command": "grant", "handler": _grant_command_handler})
+commands.append({"command": "revoke", "handler": _revoke_command_handler})
+commands.append({"command": "audit", "handler": _audit_command_handler})
# last command is quit. add new commands before this line
-commands.append({"command" : "QUIT"})
+commands.append({"command": "QUIT"})
+
def get_help():
help = ""
help += "Channels currently subscribed to : "
help += str(pubnub.get_channel_array())
help += "\n"
- for i,v in enumerate(commands):
+ for i, v in enumerate(commands):
help += "Enter " + str(i) + " for " + v['command'] + "\n"
return help
-
+
while True:
command = get_input(color.BLUE + get_help(), int)
if command == len(commands) - 1 or command is None:
diff --git a/python/examples/here-now-example.py b/python/examples/here-now-example.py
index b9f0b02..0888410 100644
--- a/python/examples/here-now-example.py
+++ b/python/examples/here-now-example.py
@@ -1,4 +1,4 @@
-## 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
@@ -14,24 +14,24 @@ sys.path.append('../')
sys.path.append('./')
from Pubnub import Pubnub
-publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo'
+publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo'
subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo'
-secret_key = len(sys.argv) > 3 and sys.argv[3] or 'demo'
-cipher_key = len(sys.argv) > 4 and sys.argv[4] or ''
-ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False
+secret_key = len(sys.argv) > 3 and sys.argv[3] or 'demo'
+cipher_key = len(sys.argv) > 4 and sys.argv[4] or ''
+ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False
## -----------------------------------------------------------------------
## Initiate Pubnub State
## -----------------------------------------------------------------------
-pubnub = Pubnub( publish_key=publish_key, subscribe_key=subscribe_key,
- secret_key=secret_key, cipher_key=cipher_key, ssl_on=ssl_on)
-crazy = 'hello_world'
+pubnub = Pubnub(publish_key=publish_key, subscribe_key=subscribe_key,
+ secret_key=secret_key, cipher_key=cipher_key, ssl_on=ssl_on)
+crazy = 'hello_world'
+
def print_cb(message):
- print(message)
+ print(message)
-pubnub.here_now( {
- 'channel' : crazy,
- 'callback' : print_cb
+pubnub.here_now({
+ 'channel': crazy,
+ 'callback': print_cb
})
-
diff --git a/python/examples/history-example.py b/python/examples/history-example.py
index bf78c7d..b5cc1fd 100755
--- a/python/examples/history-example.py
+++ b/python/examples/history-example.py
@@ -4,12 +4,11 @@ sys.path.append('./')
from Pubnub import Pubnub
## Initiat Class
-pubnub = Pubnub( 'demo', 'demo', None, False )
+pubnub = Pubnub('demo', 'demo', None, False)
## History Example
history = pubnub.history({
- 'channel' : 'hello_world',
- 'limit' : 1
+ 'channel': 'hello_world',
+ 'limit': 1
})
print(history)
-
diff --git a/python/examples/publish-example.py b/python/examples/publish-example.py
index e632aef..ebf3c73 100755
--- a/python/examples/publish-example.py
+++ b/python/examples/publish-example.py
@@ -1,4 +1,4 @@
-## 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
@@ -15,54 +15,62 @@ sys.path.append('../')
sys.path.append('../../')
from Pubnub import Pubnub
-publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo'
+publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo'
subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo'
-secret_key = len(sys.argv) > 3 and sys.argv[3] or 'demo'
-cipher_key = len(sys.argv) > 4 and sys.argv[4] or '' ##(Cipher key is Optional)
-auth_key = len(sys.argv) > 5 and sys.argv[4] or 'abcd' ##(Cipher key is Optional)
-ssl_on = len(sys.argv) > 6 and bool(sys.argv[5]) or False
+secret_key = len(sys.argv) > 3 and sys.argv[3] or 'demo'
+cipher_key = len(
+ sys.argv) > 4 and sys.argv[4] or '' # (Cipher key is Optional)
+auth_key = len(
+ sys.argv) > 5 and sys.argv[4] or 'abcd' # (Cipher key is Optional)
+ssl_on = len(sys.argv) > 6 and bool(sys.argv[5]) or False
## -----------------------------------------------------------------------
## Initiate Pubnub State
## -----------------------------------------------------------------------
-pubnub = Pubnub( publish_key, subscribe_key, secret_key, cipher_key, auth_key, ssl_on )
-crazy = 'hello_world'
+pubnub = Pubnub(
+ publish_key, subscribe_key, secret_key, cipher_key, auth_key, ssl_on)
+crazy = 'hello_world'
## -----------------------------------------------------------------------
## Publish Example
## -----------------------------------------------------------------------
+
+
def publish_complete(info):
print(info)
+
def publish_error(info):
- print('ERROR : ' + str(info))
+ print('ERROR : ' + str(info))
## Publish string
pubnub.publish({
- 'channel' : crazy,
- 'message' : 'Hello World!',
- 'callback' : publish_complete,
- 'error' : publish_error
+ 'channel': crazy,
+ 'message': 'Hello World!',
+ 'callback': publish_complete,
+ 'error': publish_error
})
## Publish list
-li = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday']
+li = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday',
+ 'Saturday']
pubnub.publish({
- 'channel' : crazy,
- 'message' : li,
- 'callback' : publish_complete,
- 'error' : publish_error
+ 'channel': crazy,
+ 'message': li,
+ 'callback': publish_complete,
+ 'error': publish_error
})
+
def done_cb(info):
publish_complete(info)
pubnub.publish({
- 'channel' : crazy,
- 'message' : { 'some_key' : 'some_val' },
- 'callback' : done_cb,
- 'error' : publish_error
+ 'channel': crazy,
+ 'message': {'some_key': 'some_val'},
+ 'callback': done_cb,
+ 'error': publish_error
})
diff --git a/python/examples/subscribe-example.py b/python/examples/subscribe-example.py
index a67a08f..0a18899 100755
--- a/python/examples/subscribe-example.py
+++ b/python/examples/subscribe-example.py
@@ -8,48 +8,55 @@ import string
from Pubnub import Pubnub
## Initiate Class
-pubnub = Pubnub( 'demo', 'demo', None, False )
+pubnub = Pubnub('demo', 'demo', None, False)
-print("My UUID is: "+pubnub.uuid)
+print("My UUID is: " + pubnub.uuid)
-channel = ''.join(random.choice(string.ascii_letters + string.digits) for x in range(20))
+channel = ''.join(
+ random.choice(string.ascii_letters + string.digits) for x in range(20))
## Subscribe Example
-def receive(message) :
+
+
+def receive(message):
print(message)
return False
+
def pres_event(message):
print(message)
return False
+
def subscribe():
print("Listening for messages on '%s' channel..." % channel)
pubnub.subscribe({
- 'channel' : channel,
- 'callback' : receive
+ 'channel': channel,
+ 'callback': receive
})
+
def presence():
print("Listening for presence events on '%s' channel..." % channel)
pubnub.presence({
- 'channel' : channel,
- 'callback' : pres_event
+ 'channel': channel,
+ 'callback': pres_event
})
+
def publish():
print("Publishing a test message on '%s' channel..." % channel)
pubnub.publish({
- 'channel' : channel,
- 'message' : { 'text':'foo bar' }
+ 'channel': channel,
+ 'message': {'text': 'foo bar'}
})
pres_thread = threading.Thread(target=presence)
-pres_thread.daemon=True
+pres_thread.daemon = True
pres_thread.start()
sub_thread = threading.Thread(target=subscribe)
-sub_thread.daemon=True
+sub_thread.daemon = True
sub_thread.start()
time.sleep(3)
@@ -60,7 +67,6 @@ publish()
print("waiting for subscribes and presence")
pres_thread.join()
-print(pubnub.here_now({'channel':channel}))
+print(pubnub.here_now({'channel': channel}))
sub_thread.join()
-
diff --git a/python/tests/subscribe-test.py b/python/tests/subscribe-test.py
index be4a416..d8a3ea2 100755
--- a/python/tests/subscribe-test.py
+++ b/python/tests/subscribe-test.py
@@ -1,4 +1,4 @@
-## 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
@@ -16,18 +16,18 @@ from Pubnub import Pubnub
from functools import partial
from threading import current_thread
import threading
-publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo'
+publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo'
subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo'
-secret_key = len(sys.argv) > 3 and sys.argv[3] or 'demo'
-cipher_key = len(sys.argv) > 4 and sys.argv[4] or None
-ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False
+secret_key = len(sys.argv) > 3 and sys.argv[3] or 'demo'
+cipher_key = len(sys.argv) > 4 and sys.argv[4] or None
+ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False
## -----------------------------------------------------------------------
## Initiate Pubnub State
## -----------------------------------------------------------------------
#pubnub = Pubnub( publish_key, subscribe_key, secret_key, cipher_key, ssl_on )
-pubnub = Pubnub( publish_key, subscribe_key, secret_key, ssl_on )
-crazy = 'hello_world'
+pubnub = Pubnub(publish_key, subscribe_key, secret_key, ssl_on)
+crazy = 'hello_world'
current = -1
@@ -37,9 +37,12 @@ received = 0
## -----------------------------------------------------------------------
## Subscribe Example
## -----------------------------------------------------------------------
+
+
def message_received(message):
print(message)
+
def check_received(message):
global current
global errors
@@ -52,19 +55,20 @@ def check_received(message):
errors += 1
else:
received += 1
- print('active thread count : ' + str( threading.activeCount()))
+ print('active thread count : ' + str(threading.activeCount()))
print('errors = ' + str(errors))
- print(current_thread().getName() + ' , ' + 'received = ' + str(received))
+ print(current_thread().getName() + ' , ' + 'received = ' + str(received))
if received != message:
- print('********** MISSED **************** ' + str( message - received ))
+ print('********** MISSED **************** ' + str(message - received))
current = message
-
-def connected_test(ch) :
- print('Connected ' + ch)
-def connected(ch) :
+def connected_test(ch):
+ print('Connected ' + ch)
+
+
+def connected(ch):
pass
@@ -75,56 +79,60 @@ pubnub.subscribe({
'callback' : message_received
})
'''
+
+
def cb1():
- pubnub.subscribe({
- 'channel' : 'efgh1',
- 'connect' : connected,
- 'callback' : message_received
- })
+ pubnub.subscribe({
+ 'channel': 'efgh1',
+ 'connect': connected,
+ 'callback': message_received
+ })
+
def cb2():
- pubnub.subscribe({
- 'channel' : 'dsm-test',
- 'connect' : connected_test,
- 'callback' : check_received
- })
+ pubnub.subscribe({
+ 'channel': 'dsm-test',
+ 'connect': connected_test,
+ 'callback': check_received
+ })
+
def cb3():
- pubnub.unsubscribe({'channel' : 'efgh1'})
+ pubnub.unsubscribe({'channel': 'efgh1'})
-def cb4():
- pubnub.unsubscribe({'channel' : 'abcd1'})
-def subscribe(channel):
- pubnub.subscribe({
- 'channel' : channel,
- 'connect' : connected,
- 'callback' : message_received
- })
+def cb4():
+ pubnub.unsubscribe({'channel': 'abcd1'})
+def subscribe(channel):
+ pubnub.subscribe({
+ 'channel': channel,
+ 'connect': connected,
+ 'callback': message_received
+ })
-pubnub.timeout(15,cb1)
+pubnub.timeout(15, cb1)
-pubnub.timeout(30,cb2)
+pubnub.timeout(30, cb2)
-pubnub.timeout(45,cb3)
+pubnub.timeout(45, cb3)
-pubnub.timeout(60,cb4)
+pubnub.timeout(60, cb4)
#'''
-for x in range(1,1000):
+for x in range(1, 1000):
#print x
def y(t):
subscribe('channel-' + str(t))
def z(t):
- pubnub.unsubscribe({'channel' : 'channel-' + str(t)})
+ pubnub.unsubscribe({'channel': 'channel-' + str(t)})
- pubnub.timeout(x + 5, partial(y,x))
- pubnub.timeout(x + 25, partial(z, x))
+ pubnub.timeout(x + 5, partial(y, x))
+ pubnub.timeout(x + 25, partial(z, x))
x += 10
#'''
diff --git a/python/tests/unit-test.py b/python/tests/unit-test.py
index 762959e..fd1bb97 100755
--- a/python/tests/unit-test.py
+++ b/python/tests/unit-test.py
@@ -1,4 +1,4 @@
-## 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
@@ -15,53 +15,55 @@ sys.path.append('..')
sys.path.append('../common')
from Pubnub import Pubnub
-publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo'
+publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo'
subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo'
-secret_key = len(sys.argv) > 3 and sys.argv[3] or None
-ssl_on = len(sys.argv) > 4 and bool(sys.argv[4]) or False
+secret_key = len(sys.argv) > 3 and sys.argv[3] or None
+ssl_on = len(sys.argv) > 4 and bool(sys.argv[4]) or False
## -----------------------------------------------------------------------
## Initiat Class
## -----------------------------------------------------------------------
-pubnub = Pubnub( publish_key, subscribe_key, secret_key, ssl_on )
-crazy = 'demo'
+pubnub = Pubnub(publish_key, subscribe_key, secret_key, ssl_on)
+crazy = 'demo'
## ---------------------------------------------------------------------------
## Unit Test Function
## ---------------------------------------------------------------------------
-def test( trial, name ) :
- if trial :
- print( 'PASS: ' + name )
- else :
- print( 'FAIL: ' + name )
+
+
+def test(trial, name):
+ if trial:
+ print('PASS: ' + name)
+ else:
+ print('FAIL: ' + name)
## -----------------------------------------------------------------------
## Publish Example
## -----------------------------------------------------------------------
publish_success = pubnub.publish({
- 'channel' : crazy,
- 'message' : crazy
+ 'channel': crazy,
+ 'message': crazy
})
-test( publish_success[0] == 1, 'Publish First Message Success' )
+test(publish_success[0] == 1, 'Publish First Message Success')
## -----------------------------------------------------------------------
## History Example
## -----------------------------------------------------------------------
history = pubnub.history({
- 'channel' : crazy,
- 'limit' : 1
+ 'channel': crazy,
+ 'limit': 1
})
test(
history[0] == crazy,
'History Message: ' + history[0]
)
-test( len(history) == 1, 'History Message Count' )
+test(len(history) == 1, 'History Message Count')
## -----------------------------------------------------------------------
## PubNub Server Time Example
## -----------------------------------------------------------------------
timestamp = pubnub.time()
-test( timestamp > 0, 'PubNub Server Time: ' + str(timestamp) )
+test(timestamp > 0, 'PubNub Server Time: ' + str(timestamp))
diff --git a/python/unassembled/Platform.py b/python/unassembled/Platform.py
index 0ffccbb..83bb6f5 100644
--- a/python/unassembled/Platform.py
+++ b/python/unassembled/Platform.py
@@ -10,13 +10,12 @@ import threading
from threading import current_thread
latest_sub_callback_lock = threading.RLock()
-latest_sub_callback = {'id' : None, 'callback' : None}
-
-
+latest_sub_callback = {'id': None, 'callback': None}
class HTTPClient:
- def __init__(self, url, urllib_func=None, callback=None, error=None, id=None):
+ def __init__(self, url, urllib_func=None,
+ callback=None, error=None, id=None):
self.url = url
self.id = id
self.callback = callback
@@ -29,7 +28,6 @@ class HTTPClient:
self.callback = None
self.error = None
-
def run(self):
def _invoke(func, data):
@@ -63,65 +61,68 @@ class HTTPClient:
try:
data = json.loads(data)
except:
- _invoke(latest_sub_callback['error'], {'error' : 'json decoding error'})
+ _invoke(latest_sub_callback['error'],
+ {'error': 'json decoding error'})
return
if code != 200:
- _invoke(latest_sub_callback['error'],data)
+ _invoke(latest_sub_callback['error'], data)
else:
- _invoke(latest_sub_callback['callback'],data)
+ _invoke(latest_sub_callback['callback'], data)
else:
try:
data = json.loads(data)
except:
- _invoke(self.error, {'error' : 'json decoding error'})
+ _invoke(self.error, {'error': 'json decoding error'})
return
if code != 200:
- _invoke(self.error,data)
+ _invoke(self.error, data)
else:
- _invoke(self.callback,data)
+ _invoke(self.callback, data)
def _urllib_request_2(url, timeout=320):
try:
- resp = urllib2.urlopen(url,timeout=timeout)
+ resp = urllib2.urlopen(url, timeout=timeout)
except urllib2.HTTPError as http_error:
resp = http_error
- return (resp.read(),resp.code)
+ return (resp.read(), resp.code)
+
def _urllib_request_3(url, timeout=320):
#print(url)
try:
- resp = urllib.request.urlopen(url,timeout=timeout)
+ resp = urllib.request.urlopen(url, timeout=timeout)
except urllib.request.HTTPError as http_error:
resp = http_error
- r = resp.read().decode("utf-8")
+ r = resp.read().decode("utf-8")
#print(r)
- return (r,resp.code)
+ return (r, resp.code)
_urllib_request = None
+
class Pubnub(PubnubCoreAsync):
def __init__(
self,
publish_key,
subscribe_key,
- secret_key = False,
- cipher_key = False,
- auth_key = None,
- ssl_on = False,
- origin = 'pubsub.pubnub.com',
- pres_uuid = None
- ) :
+ secret_key=False,
+ cipher_key=False,
+ auth_key=None,
+ ssl_on=False,
+ origin='pubsub.pubnub.com',
+ pres_uuid=None
+ ):
super(Pubnub, self).__init__(
- publish_key = publish_key,
- subscribe_key = subscribe_key,
- secret_key = secret_key,
- cipher_key = cipher_key,
- auth_key = auth_key,
- ssl_on = ssl_on,
- origin = origin,
- uuid = pres_uuid,
+ publish_key=publish_key,
+ subscribe_key=subscribe_key,
+ secret_key=secret_key,
+ cipher_key=cipher_key,
+ auth_key=auth_key,
+ ssl_on=ssl_on,
+ origin=origin,
+ uuid=pres_uuid,
_tt_lock=threading.RLock(),
_channel_list_lock=threading.RLock()
)
@@ -138,29 +139,30 @@ class Pubnub(PubnubCoreAsync):
thread = threading.Thread(target=cb)
thread.start()
-
- def _request_async( self, request, callback=None, error=None, single=False ) :
+ def _request_async(self, request, callback=None, error=None, single=False):
global _urllib_request
## Build URL
url = self.getUrl(request)
if single is True:
id = time.time()
- client = HTTPClient(url=url, urllib_func=_urllib_request, callback=None, error=None, id=id)
+ client = HTTPClient(url=url, urllib_func=_urllib_request,
+ callback=None, error=None, id=id)
with latest_sub_callback_lock:
latest_sub_callback['id'] = id
latest_sub_callback['callback'] = callback
latest_sub_callback['error'] = error
else:
- client = HTTPClient(url=url, urllib_func=_urllib_request, callback=callback, error=error)
+ client = HTTPClient(url=url, urllib_func=_urllib_request,
+ callback=callback, error=error)
thread = threading.Thread(target=client.run)
thread.start()
+
def abort():
- client.cancel();
+ client.cancel()
return abort
-
- def _request_sync( self, request) :
+ def _request_sync(self, request):
global _urllib_request
## Build URL
url = self.getUrl(request)
@@ -169,14 +171,14 @@ class Pubnub(PubnubCoreAsync):
try:
resp_json = json.loads(response[0])
except:
- return [0,"JSON Error"]
+ return [0, "JSON Error"]
if response[1] != 200 and 'status' in resp_json:
- return {'message' : resp_json['message'], 'payload' : resp_json['payload']}
+ return {'message': resp_json['message'],
+ 'payload': resp_json['payload']}
return resp_json
-
def _request(self, request, callback=None, error=None, single=False):
if callback is None:
return self._request_sync(request)
@@ -194,7 +196,7 @@ class Pubnub(PubnubCoreAsync):
resp_json = json.loads(response.read().decode("utf-8"))
except Exception as e:
return None
-
+
return resp_json
def _request3_async( self, request, callback, single=False ) :