From: Kevin Burke <kev@inburke.com>
Date: Mon, 25 Aug 2014 02:56:57 +0000 (-0700)
Subject: ConnectTimeout multiple inheritance
X-Git-Tag: v2.4.0~8^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8f9ce13e433013cd9bd4dbe9cf61c5b5f14b65ed;p=services%2Fpython-requests.git

ConnectTimeout multiple inheritance
---

diff --git a/requests/exceptions.py b/requests/exceptions.py
index d59637a..6dbd98a 100644
--- a/requests/exceptions.py
+++ b/requests/exceptions.py
@@ -51,8 +51,8 @@ class Timeout(RequestException):
     """
 
 
-class ConnectTimeout(Timeout):
-    """ The request timed out while trying to connect to the server.
+class ConnectTimeout(ConnectionError, Timeout):
+    """The request timed out while trying to connect to the server.
 
     Requests that produce this error are safe to retry
     """