aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniele Tricoli <eriol@mornie.org>2015-10-08 13:19:46 -0700
committerChristopher Baines <mail@cbaines.net>2015-12-22 14:12:58 +0000
commit39fe68dc64cc8b675bb94892935ef2c8b50f583c (patch)
tree8e36836d7fe036a52147051fd3d550a5c9d67713
parentdff63335f212d32d7c1a4bb5276f2d31f5995ea1 (diff)
downloadpython-urllib3-39fe68dc64cc8b675bb94892935ef2c8b50f583c.tar
python-urllib3-39fe68dc64cc8b675bb94892935ef2c8b50f583c.tar.gz
Do not use embedded copy of python-six.
Forwarded: not-needed Patch-Name: 01_do-not-use-embedded-python-six.patch
-rw-r--r--dummyserver/handlers.py2
-rw-r--r--test/__init__.py2
-rw-r--r--test/contrib/test_pyopenssl.py2
-rw-r--r--test/test_collections.py2
-rw-r--r--test/test_fields.py2
-rw-r--r--test/test_filepost.py2
-rw-r--r--test/test_retry.py2
-rw-r--r--urllib3/_collections.py2
-rw-r--r--urllib3/connection.py2
-rw-r--r--urllib3/connectionpool.py2
-rw-r--r--urllib3/fields.py2
-rw-r--r--urllib3/filepost.py4
-rw-r--r--urllib3/response.py4
-rw-r--r--urllib3/util/request.py2
-rw-r--r--urllib3/util/response.py3
-rw-r--r--urllib3/util/retry.py2
16 files changed, 19 insertions, 18 deletions
diff --git a/dummyserver/handlers.py b/dummyserver/handlers.py
index fb6f44f..c5ac9b4 100644
--- a/dummyserver/handlers.py
+++ b/dummyserver/handlers.py
@@ -264,7 +264,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 67f3ce9..b69ce20 100644
--- a/urllib3/_collections.py
+++ b/urllib3/_collections.py
@@ -15,7 +15,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 1e4cd41..0075541 100644
--- a/urllib3/connection.py
+++ b/urllib3/connection.py
@@ -5,7 +5,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
diff --git a/urllib3/connectionpool.py b/urllib3/connectionpool.py
index 995b416..2204b30 100644
--- a/urllib3/connectionpool.py
+++ b/urllib3/connectionpool.py
@@ -31,7 +31,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 c7d4811..2152829 100644
--- a/urllib3/fields.py
+++ b/urllib3/fields.py
@@ -2,7 +2,7 @@ from __future__ import absolute_import
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 97a2843..2fea190 100644
--- a/urllib3/filepost.py
+++ b/urllib3/filepost.py
@@ -4,8 +4,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 8f2a1b5..e034068 100644
--- a/urllib3/response.py
+++ b/urllib3/response.py
@@ -9,8 +9,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 7377931..40bf0b4 100644
--- a/urllib3/util/request.py
+++ b/urllib3/util/request.py
@@ -1,7 +1,7 @@
from __future__ import absolute_import
from base64 import b64encode
-from ..packages.six import b
+from six import b
ACCEPT_ENCODING = 'gzip,deflate'
diff --git a/urllib3/util/response.py b/urllib3/util/response.py
index bc72327..efb9e04 100644
--- a/urllib3/util/response.py
+++ b/urllib3/util/response.py
@@ -1,5 +1,6 @@
from __future__ import absolute_import
-from ..packages.six.moves import http_client as httplib
+
+from six.moves import http_client as httplib
from ..exceptions import HeaderParsingError
diff --git a/urllib3/util/retry.py b/urllib3/util/retry.py
index 03a0124..fd1f5dd 100644
--- a/urllib3/util/retry.py
+++ b/urllib3/util/retry.py
@@ -9,7 +9,7 @@ from ..exceptions import (
ReadTimeoutError,
ResponseError,
)
-from ..packages import six
+import six
log = logging.getLogger(__name__)