aboutsummaryrefslogtreecommitdiffstats
path: root/python/Pubnub.py
diff options
context:
space:
mode:
Diffstat (limited to 'python/Pubnub.py')
-rw-r--r--python/Pubnub.py12
1 files changed, 7 insertions, 5 deletions
diff --git a/python/Pubnub.py b/python/Pubnub.py
index 2eb0440..b1d1777 100644
--- a/python/Pubnub.py
+++ b/python/Pubnub.py
@@ -632,13 +632,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