aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniele Tricoli <eriol@mornie.org>2014-10-20 23:31:49 +0000
committerDaniele Tricoli <eriol@mornie.org>2014-10-20 23:31:49 +0000
commite34a0f280764876afedaeabd18e99ea4d9a77292 (patch)
treef623474554aa1c598e78576e4db896efeedd36f0
parent495e40217076806f4962aca5aeef815963a64bb1 (diff)
downloadpython-requests-e34a0f280764876afedaeabd18e99ea4d9a77292.tar
python-requests-e34a0f280764876afedaeabd18e99ea4d9a77292.tar.gz
Refresh 02_use-system-chardet-and-urllib3.patch
-rw-r--r--debian/patches/02_use-system-chardet-and-urllib3.patch6
1 files changed, 3 insertions, 3 deletions
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 <eriol@mornie.org>
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