diff options
Diffstat (limited to 'debian/patches/06_rely-on-six-to-import-httplib-or-http.client.patch')
| -rw-r--r-- | debian/patches/06_rely-on-six-to-import-httplib-or-http.client.patch | 36 |
1 files changed, 6 insertions, 30 deletions
diff --git a/debian/patches/06_rely-on-six-to-import-httplib-or-http.client.patch b/debian/patches/06_rely-on-six-to-import-httplib-or-http.client.patch index 5bea26b..435b6bb 100644 --- a/debian/patches/06_rely-on-six-to-import-httplib-or-http.client.patch +++ b/debian/patches/06_rely-on-six-to-import-httplib-or-http.client.patch @@ -1,4 +1,4 @@ -From 6037bb76fda33e09811e44f56bf3dcc73daeebc4 Mon Sep 17 00:00:00 2001 +From 7db0aa9b18e70f43ef0bfcdec7f223e5b681aaf0 Mon Sep 17 00:00:00 2001 From: SVN-Git Migration <python-modules-team@lists.alioth.debian.org> Date: Thu, 8 Oct 2015 13:19:52 -0700 Subject: Rely on six to import httplib or http.client. @@ -7,39 +7,15 @@ Origin: https://github.com/shazow/urllib3/commit/f4eb94bc36277d5d584683a03fc9eb3 Patch-Name: 06_rely-on-six-to-import-httplib-or-http.client.patch --- - urllib3/response.py | 5 +---- - urllib3/util/response.py | 5 +---- - 2 files changed, 2 insertions(+), 8 deletions(-) + urllib3/util/response.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/urllib3/response.py b/urllib3/response.py -index 64273db..c41bd2c 100644 ---- a/urllib3/response.py -+++ b/urllib3/response.py -@@ -1,7 +1,3 @@ --try: -- import http.client as httplib --except ImportError: -- import httplib - from contextlib import contextmanager - import zlib - import io -@@ -12,6 +8,7 @@ from .exceptions import ( - ProtocolError, DecodeError, ReadTimeoutError, ResponseNotChunked - ) - from six import string_types as basestring, binary_type, PY3 -+from six.moves import http_client as httplib - from .connection import HTTPException, BaseSSLError - from .util.response import is_fp_closed, is_response_to_head - diff --git a/urllib3/util/response.py b/urllib3/util/response.py -index 767ee15..6695809 100644 +index 2c1de15..6695809 100644 --- a/urllib3/util/response.py +++ b/urllib3/util/response.py -@@ -1,7 +1,4 @@ --try: -- import http.client as httplib --except ImportError: -- import httplib +@@ -1,4 +1,4 @@ +-from ..packages.six.moves import http_client as httplib +from six.moves import http_client as httplib from ..exceptions import HeaderParsingError |