From 9432da914fbd466e756a2489a05e56ca75dbf256 Mon Sep 17 00:00:00 2001 From: Daniele Tricoli Date: Tue, 23 Sep 2014 02:25:04 +0000 Subject: Refresh again --- debian/patches/01_do-not-use-embedded-python-six.patch | 9 +++++++++ 1 file changed, 9 insertions(+) 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') -- cgit v1.2.3