Add ability to pass `response` to `HTTPError()`

Just a little refactoring, but it seems nicer to me to be able to pass
the response when constructing the `HTTPError` instance instead of
constructing it and then changing the member variable.

diff --git a/AUTHORS.rst b/AUTHORS.rst
index 996392307d3b2588e29f6ef36c67a44f3be9674f..4395b3b239e76bf426ec19d43091ff9bdda92614 100644 (file)
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -122,3 +122,4 @@ Patches and Suggestions
 - Johnny Goodnow <j.goodnow29@gmail.com>
 - Denis Ryzhkov <denisr@denisr.com>
 - Wilfred Hughes <me@wilfred.me.uk> @dontYetKnow
+- Dmitry Medvinsky <me@dmedvinsky.name>

diff --git a/requests/exceptions.py b/requests/exceptions.py
index 6759af563ef10793da4fdee5b8ef3a6e1e672779..c0588f6aedec47f18553f186c742afba5a256065 100644 (file)
--- a/requests/exceptions.py
+++ b/requests/exceptions.py
@@ -16,7 +16,11 @@ class RequestException(RuntimeError):
 
 class HTTPError(RequestException):
     """An HTTP error occurred."""
-    response = None
+
+    def __init__(self, *args, **kwargs):
+        """ Initializes HTTPError with optional `response` object. """
+        self.response = kwargs.pop('response', None)
+        super(HTTPError, self).__init__(*args, **kwargs)
 
 
 class ConnectionError(RequestException):

diff --git a/requests/models.py b/requests/models.py
index faa0cbe4772091132cec38c2c2fac52a7e0e9ebc..3d27d0c53a9ae5fae9155882a576cf5410eaa685 100644 (file)
--- a/requests/models.py
+++ b/requests/models.py
@@ -657,9 +657,7 @@ class Response(object):
             http_error_msg = '%s Server Error: %s' % (self.status_code, self.reason)
 
         if http_error_msg:
-            http_error = HTTPError(http_error_msg)
-            http_error.response = self
-            raise http_error
+            raise HTTPError(http_error_msg, response=self)
 
     def close(self):
         return self.raw.release_conn()

diff --git a/test_requests.py b/test_requests.py
index 0a2e64339ed0d8e08012db065d93947f4ee6fbc8..e40d44f0cecc6eaa43d9d35e83603cad10f0bd34 100644 (file)
--- a/test_requests.py
+++ b/test_requests.py
@@ -385,7 +385,17 @@ class RequestsTestCase(unittest.TestCase):
 
         # undo monkey patch
         HTTPConnectionPool.urlopen = old_urlopen
-        
+
+    def test_http_error(self):
+        error = requests.exceptions.HTTPError()
+        self.assertEqual(error.response, None)
+        response = requests.Response()
+        error = requests.exceptions.HTTPError(response=response)
+        self.assertEqual(error.response, response)
+        error = requests.exceptions.HTTPError('message', response=response)
+        self.assertEqual(str(error), 'message')
+        self.assertEqual(error.response, response)
+
 
 if __name__ == '__main__':
     unittest.main()