From e34a0f280764876afedaeabd18e99ea4d9a77292 Mon Sep 17 00:00:00 2001 From: Daniele Tricoli Date: Mon, 20 Oct 2014 23:31:49 +0000 Subject: Refresh 02_use-system-chardet-and-urllib3.patch --- debian/patches/02_use-system-chardet-and-urllib3.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'debian/patches') diff --git a/debian/patches/02_use-system-chardet-and-urllib3.patch b/debian/patches/02_use-system-chardet-and-urllib3.patch index d37859a..8836c47 100644 --- a/debian/patches/02_use-system-chardet-and-urllib3.patch +++ b/debian/patches/02_use-system-chardet-and-urllib3.patch @@ -3,7 +3,7 @@ Description: Use the system python-chardet and python-urllib3 instead of the used to supply a stub for ``requests.packages.urllib3``. Author: Daniele Tricoli Forwarded: not-needed -Last-Update: 2014-10-08 +Last-Update: 2014-10-21 --- a/requests/adapters.py +++ b/requests/adapters.py @@ -19,9 +19,9 @@ Last-Update: 2014-10-08 +from urllib3.poolmanager import PoolManager, proxy_from_url +from urllib3.response import HTTPResponse +from urllib3.util import Timeout as TimeoutSauce - from .compat import urlparse, basestring, urldefrag + from .compat import urlparse, basestring from .utils import (DEFAULT_CA_BUNDLE_PATH, get_encoding_from_headers, - prepend_scheme_if_needed, get_auth_from_url) + prepend_scheme_if_needed, get_auth_from_url, urldefragauth) from .structures import CaseInsensitiveDict -from .packages.urllib3.exceptions import ConnectTimeoutError -from .packages.urllib3.exceptions import HTTPError as _HTTPError -- cgit v1.2.3