summaryrefslogtreecommitdiff
path: root/src/pip/_vendor/urllib3/util/timeout.py
diff options
context:
space:
mode:
Diffstat (limited to 'src/pip/_vendor/urllib3/util/timeout.py')
-rw-r--r--src/pip/_vendor/urllib3/util/timeout.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/pip/_vendor/urllib3/util/timeout.py b/src/pip/_vendor/urllib3/util/timeout.py
index ff69593b0..78e18a627 100644
--- a/src/pip/_vendor/urllib3/util/timeout.py
+++ b/src/pip/_vendor/urllib3/util/timeout.py
@@ -2,9 +2,8 @@ from __future__ import absolute_import
import time
-# The default socket timeout, used by httplib to indicate that no timeout was
-# specified by the user
-from socket import _GLOBAL_DEFAULT_TIMEOUT
+# The default socket timeout, used by httplib to indicate that no timeout was; specified by the user
+from socket import _GLOBAL_DEFAULT_TIMEOUT, getdefaulttimeout
from ..exceptions import TimeoutStateError
@@ -117,6 +116,10 @@ class Timeout(object):
__str__ = __repr__
@classmethod
+ def resolve_default_timeout(cls, timeout):
+ return getdefaulttimeout() if timeout is cls.DEFAULT_TIMEOUT else timeout
+
+ @classmethod
def _validate_timeout(cls, value, name):
"""Check that a timeout attribute is valid.