From a00dc1abf37a0348e963d4e061c3f820bddca09d Mon Sep 17 00:00:00 2001
From: Johannes <jgorset@gmail.com>
Date: Fri, 20 May 2011 18:17:46 +0200
Subject: [PATCH] Raise Timeout on request timeouts

---
 requests/models.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/requests/models.py b/requests/models.py
index aa22b809..8ae2f70d 100644
--- a/requests/models.py
+++ b/requests/models.py
@@ -238,6 +238,8 @@ class Request(object):
                 self._build_response(why)
                 if not self.redirect:
                     self.response.error = why
+            except urllib2.URLError, error:
+                raise Timeout if isinstance(error.reason, socket.timeout) else error
             else:
                 self._build_response(resp)
                 self.response.ok = True
@@ -491,6 +493,9 @@ class RequestException(Exception):
 
 class AuthenticationError(RequestException):
     """The authentication credentials provided were invalid."""
+    
+class Timeout(RequestException):
+    """The request timed out."""
 
 class URLRequired(RequestException):
     """A valid URL is required to make a request."""