Merge of maxcountryman

This commit is contained in:
Kenneth Reitz
2012-03-09 08:51:03 -08:00
parent 9f55f503b1
commit 0a1e527aec
3 changed files with 12 additions and 3 deletions
+1
View File
@@ -87,3 +87,4 @@ Patches and Suggestions
- Brendan Maguire <maguire.brendan@gmail.com>
- Chris Dary
- Danver Braganza <danverbraganza@gmail.com>
- Max Countryman
+1
View File
@@ -14,6 +14,7 @@ class RequestException(RuntimeError):
class HTTPError(RequestException):
"""An HTTP error occurred."""
response = None
class ConnectionError(RequestException):
"""A Connection error occurred."""
+10 -3
View File
@@ -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