blob: a6e4282c96afeb1f6ed77f2169a359f911575ea6 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
|
Description: Rely on six to import httplib or http.client.
Origin: https://github.com/shazow/urllib3/commit/f4eb94bc36277d5d584683a03fc9eb3950429a15
--- a/urllib3/response.py
+++ b/urllib3/response.py
@@ -1,7 +1,3 @@
-try:
- import http.client as httplib
-except ImportError:
- import httplib
from contextlib import contextmanager
import zlib
import io
@@ -12,6 +8,7 @@
ProtocolError, DecodeError, ReadTimeoutError, ResponseNotChunked
)
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
--- 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
|