Merge of maxcountryman

diff --git a/AUTHORS.rst b/AUTHORS.rst
index 0e6e7ef..9cfa7db 100644 (file)
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -87,3 +87,4 @@ Patches and Suggestions
 - Brendan Maguire <maguire.brendan@gmail.com>
 - Chris Dary
 - Danver Braganza <danverbraganza@gmail.com>
+- Max Countryman

diff --git a/requests/exceptions.py b/requests/exceptions.py
index 94860a8..d5b2ab1 100644 (file)
--- a/requests/exceptions.py
+++ b/requests/exceptions.py
@@ -14,6 +14,7 @@ class RequestException(RuntimeError):
 
 class HTTPError(RequestException):
     """An HTTP error occurred."""
+    response = None
 
 class ConnectionError(RequestException):
     """A Connection error occurred."""

diff --git a/requests/models.py b/requests/models.py
index a354eb2..753e83a 100644 (file)
--- a/requests/models.py
+++ b/requests/models.py
@@ -800,10 +800,17 @@ class Response(object):
             raise self.error
 
         if (self.status_code >= 300) and (self.status_code < 400) and not allow_redirects:
-            raise HTTPError('%s Redirection' % self.status_code)
+            http_error = HTTPError('%s Redirection' % self.status_code)
+            http_error.response = self
+            raise http_error
 
         elif (self.status_code >= 400) and (self.status_code < 500):
-            raise HTTPError('%s Client Error' % self.status_code)
+            http_error = HTTPError('%s Client Error' % self.status_code)
+            http_error.response = self
+            raise http_error
+
 
         elif (self.status_code >= 500) and (self.status_code < 600):
-            raise HTTPError('%s Server Error' % self.status_code)
+            http_error = HTTPError('%s Server Error' % self.status_code)
+            http_error.response = self
+            raise http_error