modifying code for pep 8 compliance

10 files changed, 523 insertions, 530 deletions

diff --git a/python-tornado/Pubnub.py b/python-tornado/Pubnub.py
index 5607df0..718d74e 100644
--- a/python-tornado/Pubnub.py
+++ b/python-tornado/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,45 +219,47 @@ 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")
 
-    def sign(self, channel, message):
+    '''
+
+    def _sign(self, channel, message):
         ## Sign Message
         if self.secret_key:
             signature = hashlib.md5('/'.join([
@@ -260,8 +272,9 @@ class PubnubBase(object):
         else:
             signature = '0'
         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(
@@ -270,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:
@@ -297,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:
@@ -358,16 +364,18 @@ 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( self, args ) :
+    def publish(channel, message, callback=None, error=None):
         """
         #**
         #* Publish
@@ -388,28 +396,9 @@ class PubnubBase(object):
         print(info)
 
         """
-        ## Fail if bad input.
-        if not (args['channel'] and args['message']) :
-            return [ 0, 'Missing Channel or Message' ]
-
-        ## Capture User Input
-        channel = str(args['channel'])
-
-        ## Capture Callback
-        if 'callback' in args :
-            callback = args['callback']
-        else :
-            callback = None
-
-        if 'error' in args :
-            error = args['error']
-        else :
-            error = None
 
         message = self.encrypt(args['message'])
 
-        #signature = self.sign(channel, message)
-
         ## Send Message
         return self._request({"urlcomponents": [
             'publish',
@@ -419,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, args ) :
+        ], '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
@@ -441,29 +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)})
 
-        ## Fail if missing channel
-        if not 'channel' in args :
-            raise Exception('Missing Channel.')
-            return False
-
-        ## Fail if missing callback
-        if not 'callback' in args :
-            raise Exception('Missing Callback.')
-            return False
-
-        ## Capture User Input
-        channel   = str(args['channel'])
-        callback  = args['callback']
-        subscribe_key = args.get('subscribe_key') or self.subscribe_key
-        
-        return self.subscribe({'channel': channel+'-pnpres', 'subscribe_key':subscribe_key, 'callback': self._return_wrapped_callback(callback)})
-    
-    
-    def here_now( self, args ) :
+    def here_now(self, channel, callback, error=None):
         """
         #**
         #* Here Now
@@ -484,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, args) :
+    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({
@@ -520,36 +494,27 @@ class PubnubBase(object):
         print(history)
 
         """
-        ## Capture User Input
-        channel = str(args['channel'])
 
-        callback            = args['callback']      if 'callback'  in args else None
-        error               = args['error']         if 'error'     in args else None
+        params = dict()
 
-        params = dict() 
-
-        params['count']     = str(args['count'])           if 'count'   in args else 100
-        params['reverse']   = str(args['reverse']).lower() if 'reverse' in args else 'false'
-        params['start']     = str(args['start'])           if 'start'   in args else None
-        params['end']       = str(args['end'])             if 'end'     in args else None
-
-        ## Fail if bad input.
-        if not channel :
-            raise Exception('Missing Channel')
-            return False
+        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, args = None) :
+    def time(self, callback=None):
         """
         #**
         #* Time
@@ -564,34 +529,31 @@ class PubnubBase(object):
         print(timestamp)
 
         """
-        ## Capture Callback
 
-        callback = callback if args and 'callback' in args else None
-
-        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
 
 
@@ -603,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
@@ -655,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 = ''
@@ -698,7 +666,8 @@ class PubnubCoreAsync(PubnubBase):
         for i in l:
             func(i)
 
-    def subscribe( self, args=None, sync=False ) :
+    def subscribe(self, channel, callback, error=None,
+                  connect=None, disconnect=None, reconnect=None, sync=False):
         """
         #**
         #* Subscribe
@@ -730,32 +699,17 @@ class PubnubCoreAsync(PubnubBase):
         })
 
         """
-        if args is None:
-            _invoke(error, "Arguments Missing")
-            return
-        channel         = args['channel']       if 'channel'    in args else None
-        callback        = args['callback']      if 'callback'   in args else None
-        connect         = args['connect']       if 'connect'    in args else None
-        disconnect      = args['disconnect']    if 'disconnect' in args else None
-        reconnect       = args['reconnect']     if 'reconnect'  in args else None
-        error           = args['error']         if 'error'      in args else None
 
         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 channel is None:
-            _invoke(error, "Channel Missing")
-            return
-        if callback is None:
-            _invoke(error, "Callback Missing")
-            return
-
         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)
@@ -769,27 +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)
-
-        '''
-        if callback is None:
-            _invoke(error, "Callback Missing")
-            return
-
-        if channel is None:
-            _invoke(error, "Channel Missing")
-            return
-        '''
+                    _invoke(chobj['error'], err)
 
         def _get_channel():
             for ch in self.subscriptions:
@@ -797,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()
@@ -853,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
@@ -886,22 +837,18 @@ class PubnubCoreAsync(PubnubBase):
         self._reset_offline()
         self._connect()
 
+    def unsubscribe(self, channel):
 
-    def unsubscribe( self, args ):
-
-        if 'channel' in self.subscriptions is False:
+        if channel in self.subscriptions is False:
             return False
 
-        channel = str(args['channel'])
-
-
         ## 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()
 
 
@@ -920,23 +867,28 @@ from tornado.stack_context import ExceptionStackContext
 
 ioloop = tornado.ioloop.IOLoop.instance()
 
+
 class Pubnub(PubnubCoreAsync):
 
-    def stop(self): ioloop.stop()
-    def start(self): ioloop.start()
-    def timeout( self, delay, callback):
-        ioloop.add_timeout( time.time()+float(delay), callback )
-        
+    def stop(self):
+        ioloop.stop()
+
+    def start(self):
+        ioloop.start()
+
+    def timeout(self, delay, callback):
+        ioloop.add_timeout(time.time() + float(delay), callback)
+
     def __init__(
         self,
         publish_key,
         subscribe_key,
-        secret_key = False,
-        cipher_key = False,
-        auth_key = False,
-        ssl_on = False,
-        origin = 'pubsub.pubnub.com'
-    ) :
+        secret_key=False,
+        cipher_key=False,
+        auth_key=False,
+        ssl_on=False,
+        origin='pubsub.pubnub.com'
+    ):
         super(Pubnub, self).__init__(
             publish_key=publish_key,
             subscribe_key=subscribe_key,
@@ -945,22 +897,26 @@ class Pubnub(PubnubCoreAsync):
             auth_key=auth_key,
             ssl_on=ssl_on,
             origin=origin,
-        )        
+        )
         self.headers = {}
         self.headers['User-Agent'] = 'Python-Tornado'
         self.headers['Accept-Encoding'] = self.accept_encoding
         self.headers['V'] = self.version
         self.http = tornado.httpclient.AsyncHTTPClient(max_clients=1000)
         self.id = None
-        
-    def _request( self, request, callback=None, error=None, single=False ) :
+
+    def _request(self, request, callback=None, error=None, single=False):
 
         def _invoke(func, data):
             if func is not None:
                 func(data)
 
         url = self.getUrl(request)
-        request = tornado.httpclient.HTTPRequest( url, 'GET', self.headers, connect_timeout=10, request_timeout=310 )
+        request = tornado.httpclient.HTTPRequest(
+            url, 'GET',
+            self.headers,
+            connect_timeout=10,
+            request_timeout=310)
         if single is True:
             id = time.time()
             self.id = id
@@ -968,13 +924,14 @@ class Pubnub(PubnubCoreAsync):
         def responseCallback(response):
             if single is True:
                 if not id == self.id:
-                    return None 
-                    
+                    return None
+
             body = response._get_body()
 
             if body is None:
                 return
             #print(body)
+
             def handle_exc(*args):
                 return True
             if response.error is not None:
@@ -987,7 +944,7 @@ class Pubnub(PubnubCoreAsync):
                 try:
                     data = json.loads(body.decode("utf-8"))
                 except:
-                    _invoke(error, {'error' : 'json decode error'})
+                    _invoke(error, {'error': 'json decode error'})
 
             if 'error' in data and 'status' in data and 'status' != 200:
                 _invoke(error, data)
@@ -1003,4 +960,3 @@ class Pubnub(PubnubCoreAsync):
             pass
 
         return abort
-
diff --git a/python-tornado/examples/here-now-example.py b/python-tornado/examples/here-now-example.py
index 85e3432..e6e45a3 100644
--- a/python-tornado/examples/here-now-example.py
+++ b/python-tornado/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
@@ -15,28 +15,30 @@ 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 '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, subscribe_key, secret_key, cipher_key, ssl_on )
-crazy  = 'hello_world'
+pubnub = Pubnub(publish_key, subscribe_key, secret_key, cipher_key, ssl_on)
+crazy = 'hello_world'
 
 ## -----------------------------------------------------------------------
 ## History Example
 ## -----------------------------------------------------------------------
+
+
 def here_now_complete(messages):
     print(messages)
     pubnub.stop()
 
-pubnub.here_now( {
-    'channel'  : crazy,
-    'callback' : here_now_complete
+pubnub.here_now({
+    'channel': crazy,
+    'callback': here_now_complete
 })
 
 ## -----------------------------------------------------------------------
diff --git a/python-tornado/examples/history-example.py b/python-tornado/examples/history-example.py
index c1619f4..00bdaf3 100644
--- a/python-tornado/examples/history-example.py
+++ b/python-tornado/examples/history-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
@@ -13,30 +13,32 @@ import sys
 import tornado
 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, subscribe_key, secret_key,cipher_key, ssl_on )
-crazy  = 'hello_world'
+pubnub = Pubnub(publish_key, subscribe_key, secret_key, cipher_key, ssl_on)
+crazy = 'hello_world'
 
 ## -----------------------------------------------------------------------
 ## History Example
 ## -----------------------------------------------------------------------
+
+
 def history_complete(messages):
     print(messages)
     tornado.ioloop.IOLoop.instance().stop()
 
-pubnub.history( {
-   'channel'  : crazy,
-   'limit'    : 10,
-   'callback' : history_complete
-})
+pubnub.history({
+               'channel': crazy,
+               'limit': 10,
+               'callback': history_complete
+               })
 
 ## -----------------------------------------------------------------------
 ## IO Event Loop
diff --git a/python-tornado/examples/publish-example.py b/python-tornado/examples/publish-example.py
index bb8b199..38d713c 100644
--- a/python-tornado/examples/publish-example.py
+++ b/python-tornado/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,53 +15,59 @@ 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)
-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 ''  # (Cipher key is Optional)
+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 )
-crazy  = 'hello_world'
+pubnub = Pubnub(publish_key, subscribe_key, secret_key, cipher_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-tornado/examples/subscribe-example.py b/python-tornado/examples/subscribe-example.py
index dfe8010..34ee886 100644
--- a/python-tornado/examples/subscribe-example.py
+++ b/python-tornado/examples/subscribe-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,29 +15,33 @@ 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 'demo' ##(Cipher key is Optional)
-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 'demo'  # (Cipher key is Optional)
+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 )
+pubnub = Pubnub(publish_key=publish_key, subscribe_key=subscribe_key,
+                secret_key=secret_key, cipher_key=cipher_key, ssl_on=ssl_on)
 #pubnub = Pubnub( publish_key, subscribe_key, secret_key, ssl_on )
-crazy  = 'hello_world'
+crazy = 'hello_world'
+
 
 def connect_cb():
     print 'Connect'
 
+
 def subscribe_result(response):
     print response
 
 pubnub.subscribe({
-    'channel' : crazy,
-    'callback' : subscribe_result,
-    'connect' : connect_cb 
+    'channel': crazy,
+    'callback': subscribe_result,
+    'connect': connect_cb
 })
 ## -----------------------------------------------------------------------
 ## Publish Example
@@ -54,7 +58,8 @@ pubnub.publish({
 })
 
 ## Publish list
-li = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday']
+li = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday',
+    'Saturday']
 pubnub.publish({
     'channel' : crazy,
     'message' : li,
diff --git a/python-tornado/examples/uuid-example.py b/python-tornado/examples/uuid-example.py
index f24671b..33e19f8 100644
--- a/python-tornado/examples/uuid-example.py
+++ b/python-tornado/examples/uuid-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
@@ -17,7 +17,7 @@ from Pubnub import Pubnub
 ## -----------------------------------------------------------------------
 ## Initiate Pubnub State
 ## -----------------------------------------------------------------------
-pubnub = Pubnub( "", "", "", False )
+pubnub = Pubnub("", "", "", False)
 
 ## -----------------------------------------------------------------------
 ## UUID Example
@@ -25,4 +25,3 @@ pubnub = Pubnub( "", "", "", False )
 uuid = pubnub.uuid()
 print "UUID: "
 print uuid
-
diff --git a/python-tornado/tests/delivery.py b/python-tornado/tests/delivery.py
index f3633e6..cb04332 100644
--- a/python-tornado/tests/delivery.py
+++ b/python-tornado/tests/delivery.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
@@ -20,92 +20,99 @@ from Pubnub import Pubnub
 ## -----------------------------------------------------------------------
 ## Configuration
 ## -----------------------------------------------------------------------
-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 'demo'
-ssl_on        = len(sys.argv) > 5 and bool(sys.argv[5]) or False
-origin        = len(sys.argv) > 6 and sys.argv[6] or 'pubsub.pubnub.com'
+secret_key = len(sys.argv) > 3 and sys.argv[3] or 'demo'
+cipher_key = len(sys.argv) > 4 and sys.argv[4] or 'demo'
+ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False
+origin = len(sys.argv) > 6 and sys.argv[6] or 'pubsub.pubnub.com'
 
 ## -----------------------------------------------------------------------
 ## Analytics
 ## -----------------------------------------------------------------------
 analytics = {
-    'publishes'            : 0,   ## Total Send Requests
-    'received'             : 0,   ## Total Received Messages (Deliveries)
-    'queued'               : 0,   ## Total Unreceived Queue (UnDeliveries)
-    'successful_publishes' : 0,   ## Confirmed Successful Publish Request
-    'failed_publishes'     : 0,   ## Confirmed UNSuccessful Publish Request
-    'failed_deliveries'    : 0,   ## (successful_publishes - received)
-    'deliverability'       : 0    ## Percentage Delivery
+    'publishes': 0,  # Total Send Requests
+    'received': 0,  # Total Received Messages (Deliveries)
+    'queued': 0,  # Total Unreceived Queue (UnDeliveries)
+    'successful_publishes': 0,  # Confirmed Successful Publish Request
+    'failed_publishes': 0,  # Confirmed UNSuccessful Publish Request
+    'failed_deliveries': 0,  # (successful_publishes - received)
+    'deliverability': 0  # Percentage Delivery
 }
 
 trips = {
-    'last'    : None,
-    'current' : None,
-    'max'     : 0,
-    'avg'     : 0
+    'last': None,
+    'current': None,
+    'max': 0,
+    'avg': 0
 }
 
 ## -----------------------------------------------------------------------
 ## Initiat Class
 ## -----------------------------------------------------------------------
 channel = 'deliverability-' + str(time.time())
-pubnub  = Pubnub(
+pubnub = Pubnub(
     publish_key,
     subscribe_key,
-    secret_key = secret_key,
-    cipher_key = cipher_key,
-    ssl_on = ssl_on,
-    origin = origin
+    secret_key=secret_key,
+    cipher_key=cipher_key,
+    ssl_on=ssl_on,
+    origin=origin
 )
 
 ## -----------------------------------------------------------------------
 ## BENCHMARK
 ## -----------------------------------------------------------------------
-def publish_sent(info = None):
-    if info and info[0]: analytics['successful_publishes']   += 1
-    else:                analytics['failed_publishes']       += 1
+
+
+def publish_sent(info=None):
+    if info and info[0]:
+        analytics['successful_publishes'] += 1
+    else:
+        analytics['failed_publishes'] += 1
 
     analytics['publishes'] += 1
-    analytics['queued']    += 1
+    analytics['queued'] += 1
+
+    pubnub.timeout(send, 0.1)
 
-    pubnub.timeout( send, 0.1 )
 
 def send():
     if analytics['queued'] > 100:
         analytics['queued'] -= 10
-        return pubnub.timeout( send, 10 )
+        return pubnub.timeout(send, 10)
 
     pubnub.publish({
-        'channel'  : channel,
-        'callback' : publish_sent,
-        'message'  : "1234567890"
+        'channel': channel,
+        'callback': publish_sent,
+        'message': "1234567890"
     })
 
+
 def received(message):
-    analytics['queued']   -= 1
+    analytics['queued'] -= 1
     analytics['received'] += 1
     current_trip = trips['current'] = str(datetime.datetime.now())[0:19]
-    last_trip    = trips['last']    = str(
+    last_trip = trips['last'] = str(
         datetime.datetime.now() - datetime.timedelta(seconds=1)
     )[0:19]
 
     ## New Trip Span (1 Second)
-    if not trips.has_key(current_trip) :
+    if current_trip not in trips:
         trips[current_trip] = 0
 
         ## Average
-        if trips.has_key(last_trip):
+        if last_trip in trips:
             trips['avg'] = (trips['avg'] + trips[last_trip]) / 2
 
     ## Increment Trip Counter
     trips[current_trip] = trips[current_trip] + 1
 
     ## Update Max
-    if trips[current_trip] > trips['max'] :
+    if trips[current_trip] > trips['max']:
         trips['max'] = trips[current_trip]
 
+
 def show_status():
     ## Update Failed Deliveries
     analytics['failed_deliveries'] = \
@@ -114,45 +121,46 @@ def show_status():
 
     ## Update Deliverability
     analytics['deliverability'] = (
-        float(analytics['received']) / \
+        float(analytics['received']) /
         float(analytics['successful_publishes'] or 1.0)
     ) * 100.0
 
     ## Print Display
-    print( (
-       "max:%(max)03d/sec  "                  + \
-       "avg:%(avg)03d/sec  "                  + \
-       "pubs:%(publishes)05d  "               + \
-       "received:%(received)05d  "            + \
-       "spub:%(successful_publishes)05d  "    + \
-       "fpub:%(failed_publishes)05d  "        + \
-       "failed:%(failed_deliveries)05d  "     + \
-       "queued:%(queued)03d  "                + \
-       "delivery:%(deliverability)03f%%  "    + \
-       ""
-    ) % {
-        'max'                  : trips['max'],
-        'avg'                  : trips['avg'],
-        'publishes'            : analytics['publishes'],
-        'received'             : analytics['received'],
-        'successful_publishes' : analytics['successful_publishes'],
-        'failed_publishes'     : analytics['failed_publishes'],
-        'failed_deliveries'    : analytics['failed_deliveries'],
-        'publishes'            : analytics['publishes'],
-        'deliverability'       : analytics['deliverability'],
-        'queued'               : analytics['queued']
-    } )
-    pubnub.timeout( show_status, 1 )
+    print((
+          "max:%(max)03d/sec  " +
+          "avg:%(avg)03d/sec  " +
+          "pubs:%(publishes)05d  " +
+          "received:%(received)05d  " +
+          "spub:%(successful_publishes)05d  " +
+          "fpub:%(failed_publishes)05d  " +
+          "failed:%(failed_deliveries)05d  " +
+          "queued:%(queued)03d  " +
+          "delivery:%(deliverability)03f%%  " +
+          ""
+          ) % {
+          'max': trips['max'],
+          'avg': trips['avg'],
+          'publishes': analytics['publishes'],
+          'received': analytics['received'],
+          'successful_publishes': analytics['successful_publishes'],
+          'failed_publishes': analytics['failed_publishes'],
+          'failed_deliveries': analytics['failed_deliveries'],
+          'publishes': analytics['publishes'],
+          'deliverability': analytics['deliverability'],
+          'queued': analytics['queued']
+          })
+    pubnub.timeout(show_status, 1)
+
 
 def connected():
     show_status()
-    pubnub.timeout( send, 1 )
+    pubnub.timeout(send, 1)
 
-print( "Connected: %s\n" % origin )
+print("Connected: %s\n" % origin)
 pubnub.subscribe({
-    'channel'  : channel,
-    'connect'  : connected,
-    'callback' : received
+    'channel': channel,
+    'connect': connected,
+    'callback': received
 })
 
 ## -----------------------------------------------------------------------
diff --git a/python-tornado/tests/subscribe-test.py b/python-tornado/tests/subscribe-test.py
index be4a416..d8a3ea2 100755
--- a/python-tornado/tests/subscribe-test.py
+++ b/python-tornado/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-tornado/tests/unit-tests.py b/python-tornado/tests/unit-tests.py
index fdaa194..b4b51f4 100644
--- a/python-tornado/tests/unit-tests.py
+++ b/python-tornado/tests/unit-tests.py
@@ -9,65 +9,63 @@ sys.path.append('.')
 from PubnubUnitTest import Suite
 from Pubnub import Pubnub
 
-pubnub = Pubnub("demo","demo")
+pubnub = Pubnub("demo", "demo")
 
 tests_count = 1 + 2
-test_suite = Suite(pubnub,tests_count)
+test_suite = Suite(pubnub, tests_count)
 
 tests = []
 
 
 def test_publish():
-	name = "Publish Test"
-	def success(r):
-		test_suite.test(r[0] == 1, name)
+    name = "Publish Test"
 
-	def fail(e):
-		test_suite.test(False, msg , e)
+    def success(r):
+        test_suite.test(r[0] == 1, name)
 
+    def fail(e):
+        test_suite.test(False, msg, e)
 
-	pubnub.publish({
-		'channel' : 'hello',
-		'message' : 'hi',
-		'callback' : success,
-		'error' : fail
-	})
+    pubnub.publish({
+                   'channel': 'hello',
+                   'message': 'hi',
+                   'callback': success,
+                   'error': fail
+                   })
 tests.append(test_publish)
 
 
 def test_subscribe_publish():
-	channel = "hello"
-	name = "Subscribe Publish Test"
-	publish_msg = "This is Pubnub Python-Twisted"
-	def connect():
-		def success(r):
-			test_suite.test(r[0] == 1, name, "publish success")
-
-		def fail(e):
-			test_suite.test(False, name , "Publish Failed", e)
-
-		pubnub.publish({
-			'channel' : channel,
-			'message' : publish_msg,
-			'callback' : success,
-			'error' : fail
-		})
-
-	def callback(r):
-		test_suite.test(r == publish_msg, name, "message received")
-
-	pubnub.subscribe({
-		'channel' : channel,
-		'callback' : callback,
-		'connect' : connect
-	})
+    channel = "hello"
+    name = "Subscribe Publish Test"
+    publish_msg = "This is Pubnub Python-Twisted"
+
+    def connect():
+        def success(r):
+            test_suite.test(r[0] == 1, name, "publish success")
+
+        def fail(e):
+            test_suite.test(False, name, "Publish Failed", e)
+
+        pubnub.publish({
+                       'channel': channel,
+                       'message': publish_msg,
+                       'callback': success,
+                       'error': fail
+                       })
+
+    def callback(r):
+        test_suite.test(r == publish_msg, name, "message received")
+
+    pubnub.subscribe({
+                     'channel': channel,
+                     'callback': callback,
+                     'connect': connect
+                     })
 tests.append(test_subscribe_publish)
 
 
-
-
-
 for t in tests:
-	t()
+    t()
 
 pubnub.start()
diff --git a/python-tornado/unassembled/Platform.py b/python-tornado/unassembled/Platform.py
index 02c374d..871a400 100644
--- a/python-tornado/unassembled/Platform.py
+++ b/python-tornado/unassembled/Platform.py
@@ -13,23 +13,28 @@ from tornado.stack_context import ExceptionStackContext
 
 ioloop = tornado.ioloop.IOLoop.instance()
 
+
 class Pubnub(PubnubCoreAsync):
 
-    def stop(self): ioloop.stop()
-    def start(self): ioloop.start()
-    def timeout( self, delay, callback):
-        ioloop.add_timeout( time.time()+float(delay), callback )
-        
+    def stop(self):
+        ioloop.stop()
+
+    def start(self):
+        ioloop.start()
+
+    def timeout(self, delay, callback):
+        ioloop.add_timeout(time.time() + float(delay), callback)
+
     def __init__(
         self,
         publish_key,
         subscribe_key,
-        secret_key = False,
-        cipher_key = False,
-        auth_key = False,
-        ssl_on = False,
-        origin = 'pubsub.pubnub.com'
-    ) :
+        secret_key=False,
+        cipher_key=False,
+        auth_key=False,
+        ssl_on=False,
+        origin='pubsub.pubnub.com'
+    ):
         super(Pubnub, self).__init__(
             publish_key=publish_key,
             subscribe_key=subscribe_key,
@@ -38,22 +43,26 @@ class Pubnub(PubnubCoreAsync):
             auth_key=auth_key,
             ssl_on=ssl_on,
             origin=origin,
-        )        
+        )
         self.headers = {}
         self.headers['User-Agent'] = 'Python-Tornado'
         self.headers['Accept-Encoding'] = self.accept_encoding
         self.headers['V'] = self.version
         self.http = tornado.httpclient.AsyncHTTPClient(max_clients=1000)
         self.id = None
-        
-    def _request( self, request, callback=None, error=None, single=False ) :
+
+    def _request(self, request, callback=None, error=None, single=False):
 
         def _invoke(func, data):
             if func is not None:
                 func(data)
 
         url = self.getUrl(request)
-        request = tornado.httpclient.HTTPRequest( url, 'GET', self.headers, connect_timeout=10, request_timeout=310 )
+        request = tornado.httpclient.HTTPRequest(
+            url, 'GET',
+            self.headers,
+            connect_timeout=10,
+            request_timeout=310)
         if single is True:
             id = time.time()
             self.id = id
@@ -61,13 +70,14 @@ class Pubnub(PubnubCoreAsync):
         def responseCallback(response):
             if single is True:
                 if not id == self.id:
-                    return None 
-                    
+                    return None
+
             body = response._get_body()
 
             if body is None:
                 return
             #print(body)
+
             def handle_exc(*args):
                 return True
             if response.error is not None:
@@ -80,7 +90,7 @@ class Pubnub(PubnubCoreAsync):
                 try:
                     data = json.loads(body.decode("utf-8"))
                 except:
-                    _invoke(error, {'error' : 'json decode error'})
+                    _invoke(error, {'error': 'json decode error'})
 
             if 'error' in data and 'status' in data and 'status' != 200:
                 _invoke(error, data)
@@ -96,4 +106,3 @@ class Pubnub(PubnubCoreAsync):
             pass
 
         return abort
-