From 8983da3e4e18f851ccb4f2695c71083ad2e392af Mon Sep 17 00:00:00 2001
From: Devendra
Date: Sat, 6 Jun 2015 16:19:03 +0530
Subject: fixed issue of error callback not getting invoked for presence

---
 Pubnub.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Pubnub.py')

diff --git a/Pubnub.py b/Pubnub.py
index fbb175b..5580a51 100644
--- a/Pubnub.py
+++ b/Pubnub.py
@@ -768,7 +768,7 @@ class PubnubBase(object):
             callback=self._return_wrapped_callback(callback),
             error=self._return_wrapped_callback(error))
 
-    def presence(self, channel, callback, error=None):
+    def presence(self, channel, callback, error=None, connect=None, disconnect=None, reconnect=None):
         """Subscribe to presence events on a channel.
            
            Only works in async mode
@@ -784,7 +784,7 @@ class PubnubBase(object):
         Returns:
             None
         """
-        return self.subscribe(channel+'-pnpres', callback=callback)
+        return self.subscribe(channel+'-pnpres', callback=callback, error=error, connect=connect, disconnect=disconnect, reconnect=reconnect)
 
     def presence_group(self, channel_group, callback, error=None):
         """Subscribe to presence events on a channel group.
-- 
cgit v1.2.3


From dcdafd146508f7f1f1a1868a94827bb4d6c1a3de Mon Sep 17 00:00:00 2001
From: Devendra
Date: Tue, 9 Jun 2015 01:13:03 +0530
Subject: adding channel param for error callback

---
 Pubnub.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'Pubnub.py')

diff --git a/Pubnub.py b/Pubnub.py
index 5580a51..4709e47 100644
--- a/Pubnub.py
+++ b/Pubnub.py
@@ -991,6 +991,7 @@ class PubnubBase(object):
         if ("urlparams" in request):
             url = url + '?' + "&".join([x + "=" + str(y) for x, y in request[
                 "urlparams"].items() if y is not None and len(str(y)) > 0])
+        #print(url)
         return url
 
     def _channel_registry(self, url=None, params=None, callback=None, error=None):
@@ -1684,11 +1685,17 @@ class PubnubCoreAsync(PubnubBase):
             if channel_list is None:
                 for ch in self.subscriptions:
                     chobj = self.subscriptions[ch]
-                    _invoke(chobj['error'], error)
+                    try:
+                    	_invoke(chobj['error'], error, ch)
+                    except TypeError:
+						_invoke(chobj['error'], error)
             else:
                 for ch in channel_list:
                     chobj = self.subscriptions[ch]
-                    _invoke(chobj['error'], error)
+                    try:
+						_invoke(chobj['error'], error, ch)
+                    except TypeError:
+						_invoke(chobj['error'], error)
 
         def _get_channel():
             for ch in self.subscriptions:
@@ -2107,6 +2114,8 @@ def _requests_request(url, timeout=5):
     except requests.exceptions.Timeout as error:
         msg = str(error)
         return (json.dumps(msg), 0)
+    #print (resp.text)
+    #print (resp.status_code)
     return (resp.text, resp.status_code)
 
 
-- 
cgit v1.2.3


From 437124952fd01eac9e8ccc132197ea6f18fdea56 Mon Sep 17 00:00:00 2001
From: Devendra
Date: Tue, 9 Jun 2015 01:42:23 +0530
Subject: fixing typo

---
 Pubnub.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Pubnub.py')

diff --git a/Pubnub.py b/Pubnub.py
index 4709e47..1cd2a3f 100644
--- a/Pubnub.py
+++ b/Pubnub.py
@@ -1902,7 +1902,7 @@ class PubnubCoreAsync(PubnubBase):
                 self.leave_channel(channel=channel)
 
             # remove channel from STATE
-            STATE.pop(channel, None)
+            self.STATE.pop(channel, None)
 
         self.CONNECT()
 
-- 
cgit v1.2.3