diff options
| author | Daniele Tricoli <eriol@mornie.org> | 2015-10-08 13:19:46 -0700 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2015-12-22 14:20:45 +0000 |
| commit | ef4ec8903f3642a36635cea16ca54a6ed98b5d54 (patch) | |
| tree | db85c06577df57e0cfd391eed4f8ccb8357a555e /urllib3/util | |
| parent | dff63335f212d32d7c1a4bb5276f2d31f5995ea1 (diff) | |
| download | python-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/util')
| -rw-r--r-- | urllib3/util/request.py | 2 | ||||
| -rw-r--r-- | urllib3/util/response.py | 3 | ||||
| -rw-r--r-- | urllib3/util/retry.py | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/urllib3/util/request.py b/urllib3/util/request.py index 7377931..40bf0b4 100644 --- a/urllib3/util/request.py +++ b/urllib3/util/request.py @@ -1,7 +1,7 @@ from __future__ import absolute_import 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 bc72327..efb9e04 100644 --- a/urllib3/util/response.py +++ b/urllib3/util/response.py @@ -1,5 +1,6 @@ from __future__ import absolute_import -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 03a0124..fd1f5dd 100644 --- a/urllib3/util/retry.py +++ b/urllib3/util/retry.py @@ -9,7 +9,7 @@ from ..exceptions import ( ReadTimeoutError, ResponseError, ) -from ..packages import six +import six log = logging.getLogger(__name__) |