Handle exceptions raised from Requests

sigmavirus24 · sigmavirus24 · commit 3217bbbf038a · 2016-04-16T20:54:56.000-05:00
This particular approach allows us to avoid having to rewrite every unit test that makes an assertion about the mocked session having its get, post, patch, etc. methods called. It is sub-optimal, but until we have the time and patience to rewrite the tests, thi swill have to make do. Closes sigmavirus24#597
diff --git a/github3/models.py b/github3/models.py
@@ -13,6 +13,8 @@
 from datetime import datetime
 from logging import getLogger
 
+import requests
+
 from . import exceptions
 from .decorators import requires_auth
 from .null import NullObject
@@ -176,27 +178,38 @@ def _boolean(self, response, true_code, false_code):
                 raise exceptions.error_for(response)
         return False
 
+    def _request(self, method, *args, **kwargs):
+        try:
+            request_method = getattr(self.session, method)
+            return request_method(*args, **kwargs)
+        except (requests.exceptions.ConnectionError,
+                requests.exceptions.Timeout,
+                ) as exc:
+            raise exceptions.ConnectionError(exc)
+        except requests.exceptions.RequestException as exc:
+            raise exceptions.TransportError(exc)
+
     def _delete(self, url, **kwargs):
         __logs__.debug('DELETE %s with %s', url, kwargs)
-        return self.session.delete(url, **kwargs)
+        return self._request('delete', url, **kwargs)
 
     def _get(self, url, **kwargs):
         __logs__.debug('GET %s with %s', url, kwargs)
-        return self.session.get(url, **kwargs)
+        return self._request('get', url, **kwargs)
 
     def _patch(self, url, **kwargs):
         __logs__.debug('PATCH %s with %s', url, kwargs)
-        return self.session.patch(url, **kwargs)
+        return self._request('patch', url, **kwargs)
 
     def _post(self, url, data=None, json=True, **kwargs):
         if json:
             data = dumps(data) if data is not None else data
         __logs__.debug('POST %s with %s, %s', url, data, kwargs)
-        return self.session.post(url, data, **kwargs)
+        return self._request('post', url, data, **kwargs)
 
     def _put(self, url, **kwargs):
         __logs__.debug('PUT %s with %s', url, kwargs)
-        return self.session.put(url, **kwargs)
+        return self._request('put', url, **kwargs)
 
     def _build_url(self, *args, **kwargs):
         """Builds a new API url from scratch."""
