From: miguel <miguel@immunityinc.com>
Date: Fri, 3 Feb 2012 19:16:23 +0000 (-0500)
Subject: catch TooManyRedirects in safe_mode
X-Git-Tag: v0.12.0~18^2~10
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2a27b123fd5bda2030e81995ff77e0e06f09ceca;p=services%2Fpython-requests.git

catch TooManyRedirects in safe_mode
---

diff --git a/requests/models.py b/requests/models.py
index c11858b..be6a4ed 100644
--- a/requests/models.py
+++ b/requests/models.py
@@ -631,7 +631,15 @@ class Request(object):
                 else:
                     raise
 
-            self._build_response(r)
+            # build_response can throw TooManyRedirects
+            try:
+                self._build_response(r)
+            except RequestException as e:
+                if self.config.get('safe_mode', False):
+                    # In safe mode, catch the exception
+                    self.response.error = e
+                else:
+                    raise
 
             # Response manipulation hook.
             self.response = dispatch_hook('response', self.hooks, self.response)