aboutsummaryrefslogtreecommitdiff
path: root/urllib3/util
diff options
context:
space:
mode:
authorSVN-Git Migration <python-modules-team@lists.alioth.debian.org>2015-10-08 13:19:52 -0700
committerSVN-Git Migration <python-modules-team@lists.alioth.debian.org>2015-10-08 13:19:52 -0700
commit6037bb76fda33e09811e44f56bf3dcc73daeebc4 (patch)
treee58d61d7614ea45aa213d3a9e2cb4b5cfde2461f /urllib3/util
parent7b1a10be6a3f7b3d3765abce6da5e37bace9a80d (diff)
downloadpython-urllib3-6037bb76fda33e09811e44f56bf3dcc73daeebc4.tar
python-urllib3-6037bb76fda33e09811e44f56bf3dcc73daeebc4.tar.gz
Rely on six to import httplib or http.client.
Origin: https://github.com/shazow/urllib3/commit/f4eb94bc36277d5d584683a03fc9eb3950429a15 Patch-Name: 06_rely-on-six-to-import-httplib-or-http.client.patch
Diffstat (limited to 'urllib3/util')
-rw-r--r--urllib3/util/response.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/urllib3/util/response.py b/urllib3/util/response.py
index 767ee15..6695809 100644
--- a/urllib3/util/response.py
+++ b/urllib3/util/response.py
@@ -1,7 +1,4 @@
-try:
- import http.client as httplib
-except ImportError:
- import httplib
+from six.moves import http_client as httplib
from ..exceptions import HeaderParsingError