aboutsummaryrefslogtreecommitdiff
path: root/test/__init__.py
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:20:45 +0000
commitef4ec8903f3642a36635cea16ca54a6ed98b5d54 (patch)
treedb85c06577df57e0cfd391eed4f8ccb8357a555e /test/__init__.py
parentdff63335f212d32d7c1a4bb5276f2d31f5995ea1 (diff)
downloadpython-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/__init__.py')
-rw-r--r--test/__init__.py2
1 files changed, 1 insertions, 1 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