modifying code for pep 8 compliance

1 files changed, 80 insertions, 66 deletions

diff --git a/common/PubnubCoreAsync.py b/common/PubnubCoreAsync.py
index deb6038..de7627f 100644
--- a/common/PubnubCoreAsync.py
+++ b/common/PubnubCoreAsync.py
@@ -6,32 +6,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
@@ -58,18 +64,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 = ''
@@ -101,7 +107,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
@@ -135,14 +142,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)
@@ -156,17 +164,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:
@@ -174,53 +182,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()
@@ -230,23 +243,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
@@ -263,8 +278,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
@@ -272,8 +286,8 @@ 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()