From 204649521bf8d165690b78a349d0f7c10d03bb99 Mon Sep 17 00:00:00 2001 From: Berker Peksag Date: Thu, 2 Aug 2012 23:45:06 +0300 Subject: [PATCH] Refactoring in |raise_for_status| method. - Simplified the if statements. - Remove duplicate code. --- requests/models.py | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/requests/models.py b/requests/models.py index 085be553..2d83c367 100644 --- a/requests/models.py +++ b/requests/models.py @@ -827,17 +827,15 @@ class Response(object): if self.error: raise self.error - if (self.status_code >= 300) and (self.status_code < 400) and not allow_redirects: - http_error = HTTPError('%s Redirection: %s' % (self.status_code, self.reason)) - http_error.response = self - raise http_error + if 300 <= self.status_code < 400 and not allow_redirects: + http_error_msg = '%s Redirection: %s' % (self.status_code, self.reason) - elif (self.status_code >= 400) and (self.status_code < 500): - http_error = HTTPError('%s Client Error: %s' % (self.status_code, self.reason)) - http_error.response = self - raise http_error + elif 400 <= self.status_code < 500: + http_error_msg = '%s Client Error: %s' % (self.status_code, self.reason) - elif (self.status_code >= 500) and (self.status_code < 600): - http_error = HTTPError('%s Server Error: %s' % (self.status_code, self.reason)) - http_error.response = self - raise http_error + elif 500 <= self.status_code < 600: + http_error_msg = '%s Server Error: %s' % (self.status_code, self.reason) + + http_error = HTTPError(http_error_msg) + http_error.response = self + raise http_error