fixes from pycharm

Kevin Burke · Kevin Burke · commit 9fd13ed17548 · 2014-01-28T15:59:59.000-08:00
diff --git a/twilio/jwt/__init__.py b/twilio/jwt/__init__.py
@@ -6,7 +6,7 @@
 import base64
 import hashlib
 import hmac
-from six import text_type, b
+from six import b
 
 
 # default text to binary representation conversion
diff --git a/twilio/rest/__init__.py b/twilio/rest/__init__.py
@@ -222,7 +222,7 @@ def make_twilio_request(self, method, uri, **kwargs):
                 error = resp.json()
                 code = error["code"]
                 message = "%s: %s" % (code, error["message"])
-            except:
+            except Exception:
                 code = None
                 message = resp.content
 
@@ -255,20 +255,17 @@ def __init__(self, method='GET', uri='/', status=200, code=None, msg=""):
     def __str__(self):
         """ Try to pretty-print the exception, if this is going on screen. """
 
-        def red(msg):
-            return u("\033[31m\033[49m%s\033[0m") % msg
+        def red(words):
+            return u("\033[31m\033[49m%s\033[0m") % words
 
-        def white(msg):
-            return u("\033[37m\033[49m%s\033[0m") % msg
+        def white(words):
+            return u("\033[37m\033[49m%s\033[0m") % words
 
-        def blue(msg):
-            return u("\033[34m\033[49m%s\033[0m") % msg
+        def blue(words):
+            return u("\033[34m\033[49m%s\033[0m") % words
 
-        def orange(msg):
-            return u("\033[33m\033[49m%s\033[0m") % msg
-
-        def teal(msg):
-            return u("\033[36m\033[49m%s\033[0m") % msg
+        def teal(words):
+            return u("\033[36m\033[49m%s\033[0m") % words
 
         def get_uri(code):
             return "https://www.twilio.com/docs/errors/{}".format(code)
diff --git a/twilio/rest/resources/base.py b/twilio/rest/resources/base.py
@@ -25,9 +25,6 @@ def __hash__(self):
     def __ne__(self, other):
         return not self.__eq__(other)
 
-    def get_resource(uri, **kwargs):
-        pass
-
     def request(self, method, uri, **kwargs):
         """
         Send an HTTP request to the resource.
diff --git a/twilio/rest/resources/sip/__init__.py b/twilio/rest/resources/sip/__init__.py
@@ -15,11 +15,12 @@ class Sip(object):
 
     def __init__(self, base_uri, client):
         self.uri = "%s/SIP" % base_uri
+        self.client = client
         self.domains = Domains(self.uri, client)
         self.credential_lists = SipCredentialLists(self.uri, client)
         self.ip_access_control_lists = SipIpAccessControlLists(
             self.uri,
-            client
+            client,
         )
 
     def ip_access_control_list_mappings(self, domain_sid):
@@ -28,15 +29,15 @@ def ip_access_control_list_mappings(self, domain_sid):
         :class:`Domain` with the given domain_sid
         """
         base_uri = "%s/Domains/%s" % (self.uri, domain_sid)
-        return IpAccessControlListMappings(base_uri, self.auth, self.timeout)
+        return IpAccessControlListMappings(base_uri, self.client)
 
     def credential_list_mappings(self, domain_sid):
         """
         Return a :class:`CredentialListMappings` instance for the
         :class:`Domain` with the given domain_sid
         """
         base_uri = "%s/Domains/%s" % (self.uri, domain_sid)
-        return CredentialListMappings(base_uri, self.auth, self.timeout)
+        return CredentialListMappings(base_uri, self.client)
 
     def ip_addresses(self, ip_access_control_list_sid):
         """
@@ -47,7 +48,7 @@ def ip_addresses(self, ip_access_control_list_sid):
             self.uri,
             ip_access_control_list_sid,
         )
-        return IpAddresses(base_uri, self.auth, self.timeout)
+        return IpAddresses(base_uri, self.client)
 
     def credentials(self, credential_list_sid):
         """
@@ -58,4 +59,4 @@ def credentials(self, credential_list_sid):
             self.uri,
             credential_list_sid,
         )
-        return Credentials(base_uri, self.auth, self.timeout)
+        return Credentials(base_uri, self.client)
diff --git a/twilio/rest/resources/usage.py b/twilio/rest/resources/usage.py
@@ -1,5 +1,4 @@
 from twilio.rest.resources import InstanceResource, ListResource
-from twilio.rest.resources.util import UNSET_TIMEOUT
 
 
 class UsageTrigger(InstanceResource):
diff --git a/twilio/util.py b/twilio/util.py
@@ -18,7 +18,6 @@ def compute_signature(self, uri, params):
 
         :param uri: full URI that Twilio requested on your server
         :param params: post vars that Twilio sent with the request
-        :param auth: tuple with (account_sid, token)
 
         :returns: The computed signature
         """
@@ -39,7 +38,6 @@ def validate(self, uri, params, signature):
         :param uri: full URI that Twilio requested on your server
         :param params: post vars that Twilio sent with the request
         :param signature: expexcted signature in HTTP X-Twilio-Signature header
-        :param auth: tuple with (account_sid, token)
 
         :returns: True if the request passes validation, False if not
         """
