Merge branch 'restexception-changes'

Author: Kevin Burke

setup.py

@@ -1,7 +1,10 @@
 import sys
-from twilio import __version__
 from setuptools import setup, find_packages
 
+__version__ = None
+with open('twilio/version.py') as f:
+    exec(f.read())
+
 # To install the twilio-python library, open a Terminal shell, then run this
 # file by typing:
 #

twilio/__init__.py

@@ -1,5 +1,9 @@
-__version_info__ = ('3', '6', '5')
-__version__ = '.'.join(__version_info__)
+import sys
+
+from six import u
+
+# Backwards compatibility.
+from .version import __version__, __version_info__
 
 
 class TwilioException(Exception):
@@ -12,17 +16,57 @@ class TwilioRestException(TwilioException):
     :param int status: the HTTP status that was returned for the exception
     :param str uri: The URI that caused the exception
     :param str msg: A human-readable message for the error
+    :param str method: The HTTP method used to make the request
     :param int|None code: A Twilio-specific error code for the error. This is
          not available for all errors.
     """
 
     # XXX: Move this to the twilio.rest folder
 
-    def __init__(self, status, uri, msg="", code=None):
+    def __init__(self, status, uri, msg="", code=None, method='GET'):
         self.uri = uri
         self.status = status
         self.msg = msg
         self.code = code
+        self.method = method
 
     def __str__(self):
-        return "HTTP ERROR %s: %s \n %s" % (self.status, self.msg, self.uri)
+        """ Try to pretty-print the exception, if this is going on screen. """
+
+        def red(words):
+            return u("\033[31m\033[49m%s\033[0m") % words
+
+        def white(words):
+            return u("\033[37m\033[49m%s\033[0m") % words
+
+        def blue(words):
+            return u("\033[34m\033[49m%s\033[0m") % words
+
+        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)
+
+        # If it makes sense to print a human readable error message, try to
+        # do it. The one problem is that someone might catch this error and
+        # try to display the message from it to an end user.
+        if hasattr(sys.stderr, 'isatty') and sys.stderr.isatty():
+            msg = (
+                "\n{red_error} {request_was}\n\n{http_line}"
+                "\n\n{twilio_returned}\n\n{message}\n".format(
+                    red_error=red("HTTP Error"),
+                    request_was=white("Your request was:"),
+                    http_line=teal("%s %s" % (self.method, self.uri)),
+                    twilio_returned=white(
+                        "Twilio returned the following information:"),
+                    message=blue(str(self.msg))
+                ))
+            if self.code:
+                msg = "".join([msg, "\n{more_info}\n\n{uri}\n\n".format(
+                    more_info=white("More information may be available here:"),
+                    uri=blue(get_uri(self.code))),
+                ])
+            return msg
+        else:
+            return "HTTP {} error: {}".format(self.status, self.msg)

twilio/rest/resources/base.py

@@ -1,9 +1,8 @@
 import logging
 import os
 import platform
-import sys
 
-from six import integer_types, string_types, binary_type, iteritems, u
+from six import integer_types, string_types, binary_type, iteritems
 from ...compat import urlparse
 from ...compat import urlencode
 
@@ -144,38 +143,8 @@ def make_twilio_request(method, uri, **kwargs):
             code = None
             message = resp.content
 
-        def red(msg):
-            return u("\033[31m\033[49m%s\033[0m") % msg
-
-        def white(msg):
-            return u("\033[37m\033[49m%s\033[0m") % msg
-
-        def blue(msg):
-            return u("\033[34m\033[49m%s\033[0m") % msg
-
-        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
-
-        # If it makes sense to print a human readable error message, try to do
-        # it. The one problem is that someone might catch this error and try to
-        # display the message from it to an end user.
-        if hasattr(sys.stderr, 'isatty') and sys.stderr.isatty():
-            msg = red("\nHTTP Error. ")
-            msg += white("Your request was:\n\n")
-            msg += teal("%s %s" % (method, uri))
-            msg += white("\n\nTwilio returned the following information:")
-            msg += blue("\n\n" + str(message) + "\n")
-            if code:
-                msg += white("\nMore information may be available here:\n\n")
-                msg += blue("https://www.twilio.com/docs/errors/%s" % code)
-                msg += "\n\n"
-        else:
-            msg = message
-
-        raise TwilioRestException(resp.status_code, resp.url, msg, code)
+        raise TwilioRestException(status=resp.status_code, method=method,
+                                  uri=resp.url, msg=message, code=code)
 
     return resp
 

twilio/version.py

@@ -0,0 +1,2 @@
+__version_info__ = ('3', '6', '5')
+__version__ = '.'.join(__version_info__)