aboutsummaryrefslogtreecommitdiffstats
path: root/python/unassembled/Platform.py
diff options
context:
space:
mode:
Diffstat (limited to 'python/unassembled/Platform.py')
-rw-r--r--python/unassembled/Platform.py12
1 files changed, 7 insertions, 5 deletions
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