aboutsummaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
authorDaniele Tricoli <eriol@mornie.org>2014-09-23 02:25:04 +0000
committerDaniele Tricoli <eriol@mornie.org>2014-09-23 02:25:04 +0000
commit9432da914fbd466e756a2489a05e56ca75dbf256 (patch)
treee3c337e233c92bc0d857bee13744415aeea5fe12 /debian/patches
parent18e2a6b94d3e012f5126950c7ad9012ef0f41f40 (diff)
downloadpython-urllib3-9432da914fbd466e756a2489a05e56ca75dbf256.tar
python-urllib3-9432da914fbd466e756a2489a05e56ca75dbf256.tar.gz
Refresh again
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/01_do-not-use-embedded-python-six.patch9
1 files changed, 9 insertions, 0 deletions
diff --git a/debian/patches/01_do-not-use-embedded-python-six.patch b/debian/patches/01_do-not-use-embedded-python-six.patch
index 7f44e25..a7a0716 100644
--- a/debian/patches/01_do-not-use-embedded-python-six.patch
+++ b/debian/patches/01_do-not-use-embedded-python-six.patch
@@ -157,3 +157,12 @@ Last-Update: 2014-09-23
# We need a host that will not immediately close the connection with a TCP
# Reset. SO suggests this hostname
+--- 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')