diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/Pubnub.py | 12 | ||||
| -rw-r--r-- | python/examples/here-now-example.py | 8 | ||||
| -rw-r--r-- | python/unassembled/Platform.py | 12 |
3 files changed, 20 insertions, 12 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 diff --git a/python/examples/here-now-example.py b/python/examples/here-now-example.py index 261500a..d2ca9bd 100644 --- a/python/examples/here-now-example.py +++ b/python/examples/here-now-example.py @@ -10,6 +10,7 @@ ## ----------------------------------- import sys +sys.path.append('../') from twisted.internet import reactor from Pubnub import Pubnub @@ -26,8 +27,11 @@ pubnub = Pubnub( publish_key=publish_key, subscribe_key=subscribe_key, secret_key=secret_key, cipher_key=cipher_key, ssl_on=ssl_on) crazy = 'hello_world' +def print_cb(message): + print message -print pubnub.here_now( { - 'channel' : crazy +pubnub.here_now( { + 'channel' : crazy, + 'callback' : print_cb }) 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 |
