wrap request exceptions in the library as well.

Kevin Burke · Kevin Burke · commit 2c5fa93eb395 · 2014-02-03T13:41:02.000+01:00
diff --git a/twilio/rest/__init__.py b/twilio/rest/__init__.py
@@ -193,10 +193,12 @@ def make_twilio_request(self, method, uri, **kwargs):
         :param dict params: the query parameters to attach to the request
         :param dict data: the POST form data to send with the request
 
-        :return: a requests-like HTTP response
-        :rtype: :class:`RequestsResponse`
+        :return: a response
+        :rtype: :class:`requests.Response`
         :raises TwilioRestException: if the response is a 400
-            or 500-level response, or a timeout.
+            or 500-level response
+        :raises TwilioRequestException: if a response was not received; most
+            likely a timeout, but possibly a connection error.
         """
         user_agent = "twilio-python/%s (Python %s)" % (
             twilio.__version__,
@@ -213,10 +215,14 @@ def make_twilio_request(self, method, uri, **kwargs):
 
         uri += ".json"
 
-        resp = requests.request(method, uri, auth=self.auth, headers=headers,
-                                timeout=self.transport.timeout,
-                                proxies=self.transport.proxies,
-                                **kwargs)
+        try:
+            resp = requests.request(method, uri, auth=self.auth,
+                                    headers=headers,
+                                    timeout=self.transport.timeout,
+                                    proxies=self.transport.proxies, **kwargs)
+        except requests.RequestException as e:
+            raise TwilioRequestException(e)
+
         if not resp.ok:
             try:
                 error = resp.json()
@@ -232,6 +238,21 @@ def make_twilio_request(self, method, uri, **kwargs):
         return resp
 
 
+class TwilioRequestException(TwilioException):
+    """ An exception raised when we don't get a HTTP response from the server
+
+    :param Exception reason: The wrapped exception. see requests/exceptions.py
+        for more information.
+    :param str url: the requested URL that raised an exception.
+    """
+    def __init__(self, url, reason):
+        self.reason = reason
+        message = ("Exception caused when requesting url: "
+                   "{url} (Caused by {typ}: {e})".format(
+                       url=url, typ=type(reason), e=reason))
+        TwilioException.__init__(self, message)
+
+
 class TwilioRestException(TwilioException):
     """ A generic 400 or 500 level exception from the Twilio API
 
