Merge branch 'develop' into feature/async

This commit is contained in:
Kenneth Reitz
2011-10-13 20:50:22 -04:00
+2
View File
@@ -363,6 +363,8 @@ class Request(object):
if hasattr(why, 'reason'):
if isinstance(why.reason, socket.timeout):
why = Timeout(why)
elif isinstance(why.reason, socket.error):
why = Timeout(why)
self._build_response(why, is_error=True)