exception handling changes

1 files changed, 28 insertions, 46 deletions

diff --git a/python-twisted/Pubnub.py b/python-twisted/Pubnub.py
index c312033..94d2624 100644
--- a/python-twisted/Pubnub.py
+++ b/python-twisted/Pubnub.py
@@ -186,7 +186,7 @@ import sys
 
 try:
     from urllib.parse import quote
-except:
+except ImportError:
     from urllib2 import quote
 
 from base64 import urlsafe_b64encode
@@ -397,7 +397,7 @@ class PubnubBase(object):
 
         """
 
-        message = self.encrypt(args['message'])
+        message = self.encrypt(message)
 
         ## Send Message
         return self._request({"urlcomponents": [
@@ -458,15 +458,6 @@ class PubnubBase(object):
         print(here_now['uuids'])
 
         """
-        channel = str(args['channel'])
-
-        callback = args['callback'] if 'callback' in args else None
-        error = args['error'] if 'error' in args else None
-
-        ## Fail if bad input.
-        if not channel:
-            raise Exception('Missing Channel')
-            return False
 
         ## Get Presence Here Now
         return self._request({"urlcomponents": [
@@ -807,21 +798,23 @@ class PubnubCoreAsync(PubnubBase):
                 return
 
             ## CONNECT TO PUBNUB SUBSCRIBE SERVERS
-            try:
-                self.SUB_RECEIVER = self._request({"urlcomponents": [
-                    'subscribe',
-                    self.subscribe_key,
-                    channel_list,
-                    '0',
-                    str(self.timetoken)
-                ], "urlparams": {"uuid": self.uuid, "auth": self.auth_key}},
-                    sub_callback,
-                    sub_callback,
-                    single=True)
+            #try:
+            self.SUB_RECEIVER = self._request({"urlcomponents": [
+                'subscribe',
+                self.subscribe_key,
+                channel_list,
+                '0',
+                str(self.timetoken)
+            ], "urlparams": {"uuid": self.uuid, "auth": self.auth_key}},
+                sub_callback,
+                sub_callback,
+                single=True)
+            '''
             except Exception as e:
                 print(e)
                 self.timeout(1, _connect)
                 return
+            '''
 
         self._connect = _connect
 
@@ -866,6 +859,10 @@ import twisted
 from hashlib import sha256
 import time
 import json
+
+import traceback
+
+
 from twisted.python.compat import (
     _PY3, unicode, intToBytes, networkString, nativeString)
 
@@ -918,13 +915,7 @@ class Pubnub(PubnubCoreAsync):
                 func(data)
 
         ## Build URL
-        '''
-        url = self.origin + '/' + "/".join([
-            "".join([ ' ~`!@#$%^&*()+=[]\\{}|;\':",./<>?'.find(ch) > -1 and
-                hex(ord(ch)).replace( '0x', '%' ).upper() or
-                ch for ch in list(bit)
-            ]) for bit in request])
-        '''
+
         url = self.getUrl(request)
 
         agent = ContentDecoderAgent(RedirectAgent(Agent(
@@ -937,7 +928,6 @@ class Pubnub(PubnubCoreAsync):
             request = agent.request(
                 'GET', url, Headers(self.headers), None)
         except TypeError as te:
-            print(url.encode())
             request = agent.request(
                 'GET', url.encode(), Headers(self.headers), None)
 
@@ -946,18 +936,13 @@ class Pubnub(PubnubCoreAsync):
             self.id = id
 
         def received(response):
-            finished = Deferred()
-            if response.code == 403:
-                response.deliverBody(PubNub403Response(finished))
-            else:
-                response.deliverBody(PubNubResponse(finished))
-
-            return finished
+            if not isinstance(response, twisted.web._newclient.Response):
+                _invoke(error, {"message": "Not Found"})
+                return
 
-        def error_handler(response):
             finished = Deferred()
-            if response.code == 403:
-                response.deliverBody(PubNub403Response(finished))
+            if response.code in [401, 403]:
+                response.deliverBody(PubNubPamResponse(finished))
             else:
                 response.deliverBody(PubNubResponse(finished))
 
@@ -969,10 +954,10 @@ class Pubnub(PubnubCoreAsync):
                     return None
             try:
                 data = json.loads(data)
-            except Exception as e:
+            except ValueError as e:
                 try:
                     data = json.loads(data.decode("utf-8"))
-                except:
+                except ValueError as e:
                     _invoke(error, {'error': 'json decode error'})
 
             if 'error' in data and 'status' in data and 'status' != 200:
@@ -985,7 +970,6 @@ class Pubnub(PubnubCoreAsync):
 
         request.addCallback(received)
         request.addCallback(complete)
-        request.addErrback(error_handler)
 
         return abort
 
@@ -995,12 +979,11 @@ class WebClientContextFactory(ClientContextFactory):
         return ClientContextFactory.getContext(self)
 
 
-class PubNub403Response(Protocol):
+class PubNubPamResponse(Protocol):
     def __init__(self, finished):
         self.finished = finished
 
     def dataReceived(self, bytes):
-        #print '403 resp ', bytes
         self.finished.callback(bytes)
 
 
@@ -1009,5 +992,4 @@ class PubNubResponse(Protocol):
         self.finished = finished
 
     def dataReceived(self, bytes):
-        #print bytes
         self.finished.callback(bytes)