aboutsummaryrefslogtreecommitdiff
path: root/urllib3/response.py
diff options
context:
space:
mode:
authorDaniele Tricoli <eriol@mornie.org>2015-10-09 23:07:31 +0200
committerDaniele Tricoli <eriol@mornie.org>2015-10-09 23:07:31 +0200
commit2b3d330a120a16e97cecd5163b5d454dcfe38a2b (patch)
tree18760addd0640c90d4e2b6e867fa504e1f14d237 /urllib3/response.py
parente6838673bda9af1e9bf7c4f71b25cf3e3dfc1253 (diff)
downloadpython-urllib3-2b3d330a120a16e97cecd5163b5d454dcfe38a2b.tar
python-urllib3-2b3d330a120a16e97cecd5163b5d454dcfe38a2b.tar.gz
Import python-urllib3_1.12.orig.tar.gz
Diffstat (limited to 'urllib3/response.py')
-rw-r--r--urllib3/response.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/urllib3/response.py b/urllib3/response.py
index 15d4aac..788eb6c 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 .packages.six import string_types as basestring, binary_type, PY3
+from .packages.six.moves import http_client as httplib
from .connection import HTTPException, BaseSSLError
from .util.response import is_fp_closed, is_response_to_head