aboutsummaryrefslogtreecommitdiff
path: root/test/__init__.py
diff options
context:
space:
mode:
authorDaniele Tricoli <eriol@mornie.org>2015-10-08 13:19:46 -0700
committerDaniele Tricoli <eriol@mornie.org>2015-10-09 23:15:23 +0200
commit3a7deaa269ec9e1dc5dfb860e29b053475647cf5 (patch)
tree714a980c082261a5f041968458b0aad462a4a726 /test/__init__.py
parent2b3d330a120a16e97cecd5163b5d454dcfe38a2b (diff)
downloadpython-urllib3-3a7deaa269ec9e1dc5dfb860e29b053475647cf5.tar
python-urllib3-3a7deaa269ec9e1dc5dfb860e29b053475647cf5.tar.gz
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
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