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
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
|
From 3a7deaa269ec9e1dc5dfb860e29b053475647cf5 Mon Sep 17 00:00:00 2001
From: Daniele Tricoli <eriol@mornie.org>
Date: Thu, 8 Oct 2015 13:19:46 -0700
Subject: Do not use embedded copy of python-six.
Forwarded: not-needed
Last-Update: 2015-05-03
Patch-Name: 01_do-not-use-embedded-python-six.patch
---
dummyserver/handlers.py | 2 +-
test/__init__.py | 2 +-
test/contrib/test_pyopenssl.py | 2 +-
test/test_collections.py | 2 +-
test/test_fields.py | 2 +-
test/test_filepost.py | 2 +-
test/test_retry.py | 2 +-
urllib3/_collections.py | 2 +-
urllib3/connection.py | 2 +-
urllib3/connectionpool.py | 2 +-
urllib3/fields.py | 2 +-
urllib3/filepost.py | 4 ++--
urllib3/response.py | 4 ++--
urllib3/util/request.py | 2 +-
urllib3/util/retry.py | 2 +-
15 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/dummyserver/handlers.py b/dummyserver/handlers.py
index 43398cd..a7828a3 100644
--- a/dummyserver/handlers.py
+++ b/dummyserver/handlers.py
@@ -263,7 +263,7 @@ def _parse_header(line):
"""
import tornado.httputil
import email.utils
- from urllib3.packages import six
+ import six
if not six.PY3:
line = line.encode('utf-8')
parts = tornado.httputil._parseparam(';' + line)
diff --git a/test/__init__.py b/test/__init__.py
index f7c4a7a..22d3616 100644
--- a/test/__init__.py
+++ b/test/__init__.py
@@ -8,7 +8,7 @@ import socket
from nose.plugins.skip import SkipTest
from urllib3.exceptions import MaxRetryError, HTTPWarning
-from urllib3.packages import six
+import six
# We need a host that will not immediately close the connection with a TCP
# Reset. SO suggests this hostname
diff --git a/test/contrib/test_pyopenssl.py b/test/contrib/test_pyopenssl.py
index 5d57527..f23ff19 100644
--- a/test/contrib/test_pyopenssl.py
+++ b/test/contrib/test_pyopenssl.py
@@ -1,5 +1,5 @@
from nose.plugins.skip import SkipTest
-from urllib3.packages import six
+import six
if six.PY3:
raise SkipTest('Testing of PyOpenSSL disabled on PY3')
diff --git a/test/test_collections.py b/test/test_collections.py
index 9d72939..78ef634 100644
--- a/test/test_collections.py
+++ b/test/test_collections.py
@@ -4,7 +4,7 @@ from urllib3._collections import (
HTTPHeaderDict,
RecentlyUsedContainer as Container
)
-from urllib3.packages import six
+import six
xrange = six.moves.xrange
from nose.plugins.skip import SkipTest
diff --git a/test/test_fields.py b/test/test_fields.py
index cdec68b..66da148 100644
--- a/test/test_fields.py
+++ b/test/test_fields.py
@@ -1,7 +1,7 @@
import unittest
from urllib3.fields import guess_content_type, RequestField
-from urllib3.packages.six import u
+from six import u
class TestRequestField(unittest.TestCase):
diff --git a/test/test_filepost.py b/test/test_filepost.py
index 390dbb3..ecc6710 100644
--- a/test/test_filepost.py
+++ b/test/test_filepost.py
@@ -2,7 +2,7 @@ import unittest
from urllib3.filepost import encode_multipart_formdata, iter_fields
from urllib3.fields import RequestField
-from urllib3.packages.six import b, u
+from six import b, u
BOUNDARY = '!! test boundary !!'
diff --git a/test/test_retry.py b/test/test_retry.py
index 421e508..8fcc287 100644
--- a/test/test_retry.py
+++ b/test/test_retry.py
@@ -1,7 +1,7 @@
import unittest
from urllib3.response import HTTPResponse
-from urllib3.packages.six.moves import xrange
+from six.moves import xrange
from urllib3.util.retry import Retry
from urllib3.exceptions import (
ConnectTimeoutError,
diff --git a/urllib3/_collections.py b/urllib3/_collections.py
index b68b9a5..af8074a 100644
--- a/urllib3/_collections.py
+++ b/urllib3/_collections.py
@@ -14,7 +14,7 @@ try: # Python 2.7+
from collections import OrderedDict
except ImportError:
from .packages.ordered_dict import OrderedDict
-from .packages.six import iterkeys, itervalues, PY3
+from six import iterkeys, itervalues, PY3
__all__ = ['RecentlyUsedContainer', 'HTTPHeaderDict']
diff --git a/urllib3/connection.py b/urllib3/connection.py
index 3eab1e2..115eac9 100644
--- a/urllib3/connection.py
+++ b/urllib3/connection.py
@@ -3,7 +3,7 @@ import sys
import socket
from socket import error as SocketError, timeout as SocketTimeout
import warnings
-from .packages import six
+import six
try: # Python 3
from http.client import HTTPConnection as _HTTPConnection, HTTPException
diff --git a/urllib3/connectionpool.py b/urllib3/connectionpool.py
index b38ac68..563f108 100644
--- a/urllib3/connectionpool.py
+++ b/urllib3/connectionpool.py
@@ -30,7 +30,7 @@ from .exceptions import (
NewConnectionError,
)
from .packages.ssl_match_hostname import CertificateError
-from .packages import six
+import six
from .connection import (
port_by_scheme,
DummyConnection,
diff --git a/urllib3/fields.py b/urllib3/fields.py
index c853f8d..5fe3c24 100644
--- a/urllib3/fields.py
+++ b/urllib3/fields.py
@@ -1,7 +1,7 @@
import email.utils
import mimetypes
-from .packages import six
+import six
def guess_content_type(filename, default='application/octet-stream'):
diff --git a/urllib3/filepost.py b/urllib3/filepost.py
index 0fbf488..97ab970 100644
--- a/urllib3/filepost.py
+++ b/urllib3/filepost.py
@@ -3,8 +3,8 @@ import codecs
from uuid import uuid4
from io import BytesIO
-from .packages import six
-from .packages.six import b
+import six
+from six import b
from .fields import RequestField
writer = codecs.lookup('utf-8')[3]
diff --git a/urllib3/response.py b/urllib3/response.py
index 788eb6c..c41bd2c 100644
--- a/urllib3/response.py
+++ b/urllib3/response.py
@@ -7,8 +7,8 @@ from ._collections import HTTPHeaderDict
from .exceptions import (
ProtocolError, DecodeError, ReadTimeoutError, ResponseNotChunked
)
-from .packages.six import string_types as basestring, binary_type, PY3
-from .packages.six.moves import http_client as httplib
+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/request.py b/urllib3/util/request.py
index bc64f6b..5f4ccfd 100644
--- a/urllib3/util/request.py
+++ b/urllib3/util/request.py
@@ -1,6 +1,6 @@
from base64 import b64encode
-from ..packages.six import b
+from six import b
ACCEPT_ENCODING = 'gzip,deflate'
diff --git a/urllib3/util/retry.py b/urllib3/util/retry.py
index 1fb1f23..178b374 100644
--- a/urllib3/util/retry.py
+++ b/urllib3/util/retry.py
@@ -8,7 +8,7 @@ from ..exceptions import (
ReadTimeoutError,
ResponseError,
)
-from ..packages import six
+import six
log = logging.getLogger(__name__)
|