From c64c0ab1215168adf2384888f3d52bd99217d723 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Tue, 24 Sep 2013 14:06:24 -0400 Subject: [PATCH] prototype for new urllib3 timeouts --- requests/adapters.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/requests/adapters.py b/requests/adapters.py index 750afec..b9a12b0 100644 --- a/requests/adapters.py +++ b/requests/adapters.py @@ -13,6 +13,7 @@ import socket from .models import Response from .packages.urllib3.poolmanager import PoolManager, proxy_from_url from .packages.urllib3.response import HTTPResponse +from .packages.urllib3.util import Timeout from .compat import urlparse, basestring, urldefrag, unquote from .utils import (DEFAULT_CA_BUNDLE_PATH, get_encoding_from_headers, except_on_missing_scheme, get_auth_from_url) @@ -298,6 +299,11 @@ class HTTPAdapter(BaseAdapter): chunked = not (request.body is None or 'Content-Length' in request.headers) + if stream: + timeout = Timeout(connect=timeout) + else: + timeout = Timeout(connect=timeout, read=timeout) + try: if not chunked: resp = conn.urlopen( -- 2.7.4