aboutsummaryrefslogtreecommitdiff
path: root/test/__init__.py
diff options
context:
space:
mode:
authorDaniele Tricoli <eriol@mornie.org>2015-10-08 13:19:46 -0700
committerSVN-Git Migration <python-modules-team@lists.alioth.debian.org>2015-10-08 13:19:46 -0700
commite720aa3dea81bf5c30d9a897f9cbae18bf6a4228 (patch)
tree36e781b19665082d50c5e84104010a0cfc685a1d /test/__init__.py
parente6838673bda9af1e9bf7c4f71b25cf3e3dfc1253 (diff)
downloadpython-urllib3-e720aa3dea81bf5c30d9a897f9cbae18bf6a4228.tar
python-urllib3-e720aa3dea81bf5c30d9a897f9cbae18bf6a4228.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 172493c..7ea6358 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