From: Josh Imhoff <joshimhoff13@gmail.com>
Date: Wed, 9 May 2012 19:13:12 +0000 (-0400)
Subject: Now, safe_mode will catch socket.timeout too.
X-Git-Tag: v0.13.0~28^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=db43eb4cb9fcd1ad5565cc2bff5b8cdfec549648;p=services%2Fpython-requests.git

Now, safe_mode will catch socket.timeout too.
---

diff --git a/requests/safe_mode.py b/requests/safe_mode.py
index 7a0f218..619d368 100644
--- a/requests/safe_mode.py
+++ b/requests/safe_mode.py
@@ -12,8 +12,9 @@ This module contains a decorator that implements safe_mode.
 """
 
 from .models import Response
-from .exceptions import RequestException, ConnectionError, HTTPError
 from .packages.urllib3.response import HTTPResponse
+from .exceptions import RequestException, ConnectionError, HTTPError
+import socket
 
 def catch_exceptions_if_in_safe_mode(function):
     """New implementation of safe_mode. We catch all exceptions at the API level
@@ -27,7 +28,7 @@ def catch_exceptions_if_in_safe_mode(function):
                                             and kwargs.get('session').config.get('safe_mode')):
             try:
                 return function(method, url, **kwargs)
-            except (RequestException, ConnectionError, HTTPError) as e:
+            except (RequestException, ConnectionError, HTTPError, socket.timeout) as e:
                 r = Response()
                 r.error = e
                 r.raw = HTTPResponse() # otherwise, tests fail