Merge pull request psf#751 from Lukasa/develop

Catch socket.gaierror in safe mode.
kennethreitz · Aug 2, 2012 · 664880d · 664880d
2 parents 22179c4 + 4f40b3b
commit 664880d
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/requests/safe_mode.py b/requests/safe_mode.py
@@ -28,7 +28,8 @@ def wrapped(method, url, **kwargs):
                                             and kwargs.get('session').config.get('safe_mode')):
             try:
                 return function(method, url, **kwargs)
-            except (RequestException, ConnectionError, HTTPError, socket.timeout) as e:
+            except (RequestException, ConnectionError, HTTPError,
+                    socket.timeout, socket.gaierror) as e:
                 r = Response()
                 r.error = e
                 r.raw = HTTPResponse() # otherwise, tests fail