From 09d6ea1fa20f87dc648740ffb2a70f67e7e4efa9 Mon Sep 17 00:00:00 2001
From: Devendra
Date: Wed, 25 Sep 2013 13:51:19 +0530
Subject: combining into Pubnub.py, added common async unit test method

---
 python/unassembled/Platform.py | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 python/unassembled/Platform.py

(limited to 'python/unassembled/Platform.py')

diff --git a/python/unassembled/Platform.py b/python/unassembled/Platform.py
new file mode 100644
index 0000000..ef69473
--- /dev/null
+++ b/python/unassembled/Platform.py
@@ -0,0 +1,38 @@
+
+class Pubnub(PubnubCore):
+    def __init__(
+        self,
+        publish_key,
+        subscribe_key,
+        secret_key = False,
+        cipher_key = False,
+        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,
+            ssl_on = ssl_on,
+            origin = origin,
+            uuid = pres_uuid
+        )        
+
+    def _request( self, request, callback = None ) :
+        ## Build URL
+        url = self.getUrl(request)
+
+        ## Send Request Expecting JSONP Response
+        try:
+            try: usock = urllib2.urlopen( url, None, 200 )
+            except TypeError: usock = urllib2.urlopen( url, None )
+            response = usock.read()
+            usock.close()
+            if (callback):
+                callback(json.loads(response))
+            else:
+                return json.loads( response )
+        except:
+            return None
-- 
cgit v1.2.3


From 7ec3bbe414abe58072fda63f4f9c801f77b292e1 Mon Sep 17 00:00:00 2001
From: Devendra
Date: Sun, 6 Oct 2013 14:39:59 +0530
Subject: changing timeout from 200 to 310 s, changed exception handling to not
 silently eat execeptions in callback

---
 python/unassembled/Platform.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'python/unassembled/Platform.py')

diff --git a/python/unassembled/Platform.py b/python/unassembled/Platform.py
index ef69473..f598a98 100644
--- a/python/unassembled/Platform.py
+++ b/python/unassembled/Platform.py
@@ -26,13 +26,15 @@ class Pubnub(PubnubCore):
 
         ## Send Request Expecting JSONP Response
         try:
-            try: usock = urllib2.urlopen( url, None, 200 )
+            try: usock = urllib2.urlopen( url, None, 310 )
             except TypeError: usock = urllib2.urlopen( url, None )
             response = usock.read()
             usock.close()
-            if (callback):
-                callback(json.loads(response))
-            else:
-                return json.loads( response )
+            resp_json = json.loads(response)
         except:
             return None
+            
+        if (callback):
+            callback(resp_json)
+        else:
+            return resp_json
-- 
cgit v1.2.3