diff options
| author | Daniele Tricoli <eriol@mornie.org> | 2015-10-08 13:19:46 -0700 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2015-12-22 14:20:45 +0000 |
| commit | ef4ec8903f3642a36635cea16ca54a6ed98b5d54 (patch) | |
| tree | db85c06577df57e0cfd391eed4f8ccb8357a555e /test | |
| parent | dff63335f212d32d7c1a4bb5276f2d31f5995ea1 (diff) | |
| download | python-urllib3-ef4ec8903f3642a36635cea16ca54a6ed98b5d54.tar python-urllib3-ef4ec8903f3642a36635cea16ca54a6ed98b5d54.tar.gz | |
Do not use embedded copy of python-six.
Forwarded: not-needed
Patch-Name: 01_do-not-use-embedded-python-six.patch
Diffstat (limited to 'test')
| -rw-r--r-- | test/__init__.py | 2 | ||||
| -rw-r--r-- | test/contrib/test_pyopenssl.py | 2 | ||||
| -rw-r--r-- | test/test_collections.py | 2 | ||||
| -rw-r--r-- | test/test_fields.py | 2 | ||||
| -rw-r--r-- | test/test_filepost.py | 2 | ||||
| -rw-r--r-- | test/test_retry.py | 2 | ||||
| -rw-r--r-- | test/with_dummyserver/test_https.py | 2 |
7 files changed, 7 insertions, 7 deletions
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/test/with_dummyserver/test_https.py b/test/with_dummyserver/test_https.py index 7319d7e..8c16d30 100644 --- a/test/with_dummyserver/test_https.py +++ b/test/with_dummyserver/test_https.py @@ -36,7 +36,7 @@ from urllib3.exceptions import ( SystemTimeWarning, InsecurePlatformWarning, ) -from urllib3.packages import six +import six from urllib3.util.timeout import Timeout from urllib3.util.ssl_ import HAS_SNI |