diff options
| author | SVN-Git Migration <python-modules-team@lists.alioth.debian.org> | 2015-10-08 13:19:52 -0700 |
|---|---|---|
| committer | SVN-Git Migration <python-modules-team@lists.alioth.debian.org> | 2015-10-08 13:19:52 -0700 |
| commit | 6037bb76fda33e09811e44f56bf3dcc73daeebc4 (patch) | |
| tree | e58d61d7614ea45aa213d3a9e2cb4b5cfde2461f | |
| parent | 7b1a10be6a3f7b3d3765abce6da5e37bace9a80d (diff) | |
| download | python-urllib3-6037bb76fda33e09811e44f56bf3dcc73daeebc4.tar python-urllib3-6037bb76fda33e09811e44f56bf3dcc73daeebc4.tar.gz | |
Rely on six to import httplib or http.client.
Origin: https://github.com/shazow/urllib3/commit/f4eb94bc36277d5d584683a03fc9eb3950429a15
Patch-Name: 06_rely-on-six-to-import-httplib-or-http.client.patch
| -rw-r--r-- | urllib3/response.py | 5 | ||||
| -rw-r--r-- | urllib3/util/response.py | 5 |
2 files changed, 2 insertions, 8 deletions
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 --- a/urllib3/util/response.py +++ b/urllib3/util/response.py @@ -1,7 +1,4 @@ -try: - import http.client as httplib -except ImportError: - import httplib +from six.moves import http_client as httplib from ..exceptions import HeaderParsingError |