aboutsummaryrefslogtreecommitdiff
path: root/urllib3/util
diff options
context:
space:
mode:
authorDaniele Tricoli <eriol@mornie.org>2015-10-08 13:19:46 -0700
committerDaniele Tricoli <eriol@mornie.org>2015-10-10 03:11:05 +0200
commit4e097b776bf499a02b262c722487fcd55c2ee379 (patch)
tree3dbe744a7011e78b3cc64ff7ed9b04597791a2ec /urllib3/util
parent2b3d330a120a16e97cecd5163b5d454dcfe38a2b (diff)
downloadpython-urllib3-4e097b776bf499a02b262c722487fcd55c2ee379.tar
python-urllib3-4e097b776bf499a02b262c722487fcd55c2ee379.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/util')
-rw-r--r--urllib3/util/request.py2
-rw-r--r--urllib3/util/response.py2
-rw-r--r--urllib3/util/retry.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/urllib3/util/request.py b/urllib3/util/request.py
index bc64f6b..5f4ccfd 100644
--- a/urllib3/util/request.py
+++ b/urllib3/util/request.py
@@ -1,6 +1,6 @@
from base64 import b64encode
-from ..packages.six import b
+from six import b
ACCEPT_ENCODING = 'gzip,deflate'
diff --git a/urllib3/util/response.py b/urllib3/util/response.py
index 2c1de15..6695809 100644
--- a/urllib3/util/response.py
+++ b/urllib3/util/response.py
@@ -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
diff --git a/urllib3/util/retry.py b/urllib3/util/retry.py
index 1fb1f23..178b374 100644
--- a/urllib3/util/retry.py
+++ b/urllib3/util/retry.py
@@ -8,7 +8,7 @@ from ..exceptions import (
ReadTimeoutError,
ResponseError,
)
-from ..packages import six
+import six
log = logging.getLogger(__name__)