blob: f045f5a3e93351e98725d5d9e24378dddf908941 (
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
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
Description: Do not use embedded copy of python-six.
Author: Daniele Tricoli <eriol@mornie.org>
Forwarded: not-needed
Last-Update: 2012-03-19
--- a/requests/packages/urllib3/connectionpool.py
+++ b/requests/packages/urllib3/connectionpool.py
@@ -51,7 +51,7 @@
)
from .packages.ssl_match_hostname import match_hostname, CertificateError
-from .packages import six
+import six
xrange = six.moves.xrange
--- a/requests/packages/urllib3/filepost.py
+++ b/requests/packages/urllib3/filepost.py
@@ -14,8 +14,8 @@
from io import BytesIO
-from .packages import six
-from .packages.six import b
+import six
+from six import b
writer = codecs.lookup('utf-8')[3]
--- a/requests/packages/urllib3/response.py
+++ b/requests/packages/urllib3/response.py
@@ -11,7 +11,7 @@
from io import BytesIO
from .exceptions import HTTPError
-from .packages.six import string_types as basestring
+from six import string_types as basestring
log = logging.getLogger(__name__)
--- a/requests/packages/urllib3/util.py
+++ b/requests/packages/urllib3/util.py
@@ -16,7 +16,7 @@
except ImportError: # `select` doesn't exist on AppEngine.
select = False
-from .packages import six
+import six
from .exceptions import LocationParseError
|