aboutsummaryrefslogtreecommitdiff
path: root/urllib3/response.py
diff options
context:
space:
mode:
authorDaniele Tricoli <eriol@mornie.org>2015-10-08 13:19:46 -0700
committerDaniele Tricoli <eriol@mornie.org>2015-10-09 23:15:23 +0200
commit3a7deaa269ec9e1dc5dfb860e29b053475647cf5 (patch)
tree714a980c082261a5f041968458b0aad462a4a726 /urllib3/response.py
parent2b3d330a120a16e97cecd5163b5d454dcfe38a2b (diff)
downloadpython-urllib3-3a7deaa269ec9e1dc5dfb860e29b053475647cf5.tar
python-urllib3-3a7deaa269ec9e1dc5dfb860e29b053475647cf5.tar.gz
Do not use embedded copy of python-six.
Forwarded: not-needed Last-Update: 2015-05-03 Patch-Name: 01_do-not-use-embedded-python-six.patch
Diffstat (limited to 'urllib3/response.py')
-rw-r--r--urllib3/response.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/urllib3/response.py b/urllib3/response.py
index 788eb6c..c41bd2c 100644
--- a/urllib3/response.py
+++ b/urllib3/response.py
@@ -7,8 +7,8 @@ from ._collections import HTTPHeaderDict
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 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