aboutsummaryrefslogtreecommitdiff
path: root/urllib3/response.py
diff options
context:
space:
mode:
authorDaniele Tricoli <eriol@mornie.org>2015-10-08 13:19:46 -0700
committerChristopher Baines <mail@cbaines.net>2015-12-22 14:20:45 +0000
commitef4ec8903f3642a36635cea16ca54a6ed98b5d54 (patch)
treedb85c06577df57e0cfd391eed4f8ccb8357a555e /urllib3/response.py
parentdff63335f212d32d7c1a4bb5276f2d31f5995ea1 (diff)
downloadpython-urllib3-ef4ec8903f3642a36635cea16ca54a6ed98b5d54.tar
python-urllib3-ef4ec8903f3642a36635cea16ca54a6ed98b5d54.tar.gz
Do not use embedded copy of python-six.
Forwarded: not-needed 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 8f2a1b5..e034068 100644
--- a/urllib3/response.py
+++ b/urllib3/response.py
@@ -9,8 +9,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