From 9ac3ccf6283772b404a0c80945e3cdf3406ac5bf Mon Sep 17 00:00:00 2001
From: Devendra
Date: Tue, 25 Mar 2014 11:47:03 +0530
Subject: making version 2 and version 3 work same time

---
 python/unassembled/Platform.py | 34 ++++++++++++++++++++++++++++++----
 1 file changed, 30 insertions(+), 4 deletions(-)

(limited to 'python/unassembled')

diff --git a/python/unassembled/Platform.py b/python/unassembled/Platform.py
index 55ec449..c60690f 100644
--- a/python/unassembled/Platform.py
+++ b/python/unassembled/Platform.py
@@ -1,5 +1,7 @@
-
-import urllib.request
+try:
+    import urllib.request
+except:
+    import urllib2
 
 class Pubnub(PubnubCore):
     def __init__(
@@ -21,16 +23,40 @@ class Pubnub(PubnubCore):
             origin = origin,
             uuid = pres_uuid
         )
+        if self.python_version == 2:
+            self._request = self._request2
+        else:
+            self._request = self._request3
+
+    def _request2( self, request, callback = None ) :
+        ## Build URL
+        url = self.getUrl(request)
+
+        ## Send Request Expecting JSONP Response
+        try:
+            try: usock = urllib2.urlopen( url, None, 310 )
+            except TypeError: usock = urllib2.urlopen( url, None )
+            response = usock.read()
+            usock.close()
+            resp_json = json.loads(response)
+        except:
+            return None
+            
+        if (callback):
+            callback(resp_json)
+        else:
+            return resp_json
+
 
-    def _request( self, request, callback = None ) :
+    def _request3( self, request, callback = None ) :
         ## Build URL
         url = self.getUrl(request)
-        print(url)
         ## Send Request Expecting JSONP Response
         try:
             response = urllib.request.urlopen(url,timeout=310)
             resp_json = json.loads(response.read().decode("utf-8"))
         except Exception as e:
+            print(e)
             return None
             
         if (callback):
-- 
cgit v1.2.3