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
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
From 6037bb76fda33e09811e44f56bf3dcc73daeebc4 Mon Sep 17 00:00:00 2001
From: SVN-Git Migration <python-modules-team@lists.alioth.debian.org>
Date: Thu, 8 Oct 2015 13:19:52 -0700
Subject: 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
---
urllib3/response.py | 5 +----
urllib3/util/response.py | 5 +----
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/urllib3/response.py b/urllib3/response.py
index 64273db..c41bd2c 100644
--- 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 @@ from .exceptions import (
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
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
|