Merge pull request twilio#100 from BlockMaster/feature-twilio-error-in-exception

Kevin Burke · Kevin Burke · commit ee4a3d20472a · 2012-12-12T19:43:27.000-08:00
Pass the Twilio error code with TwilioRestException
diff --git a/twilio/__init__.py b/twilio/__init__.py
@@ -8,10 +8,11 @@ class TwilioException(Exception):
 
 class TwilioRestException(TwilioException):
 
-    def __init__(self, status, uri, msg=""):
+    def __init__(self, status, uri, msg="", code=None):
         self.uri = uri
         self.status = status
         self.msg = msg
+        self.code = code
 
     def __str__(self):
         return "HTTP ERROR %s: %s \n %s" % (self.status, self.msg, self.uri)
diff --git a/twilio/rest/resources/base.py b/twilio/rest/resources/base.py
@@ -78,11 +78,13 @@ def make_twilio_request(method, uri, **kwargs):
     if not resp.ok:
         try:
             error = json.loads(resp.content)
-            message = "%s: %s" % (error["code"], error["message"])
+            code = error["code"]
+            message = "%s: %s" % (code, error["message"])
         except:
+            code = None
             message = resp.content
 
-        raise TwilioRestException(resp.status_code, resp.url, message)
+        raise TwilioRestException(resp.status_code, resp.url, message, code)
 
     return resp
 
