aboutsummaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
authorDaniele Tricoli <eriol@mornie.org>2014-09-23 01:17:39 +0000
committerDaniele Tricoli <eriol@mornie.org>2014-09-23 01:17:39 +0000
commitbbb1c4ec884f343ef5957b877f21dfc11da7e155 (patch)
treea4cb2f4c91aa8f335bd9fb424fcb82fb8eddcfc4 /debian/patches
parent18a76ec3f43bd06c3cb1e6dda3fca4456b5e78e0 (diff)
downloadpython-urllib3-bbb1c4ec884f343ef5957b877f21dfc11da7e155.tar
python-urllib3-bbb1c4ec884f343ef5957b877f21dfc11da7e155.tar.gz
Fix forgotten six import
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/01_do-not-use-embedded-python-six.patch11
1 files changed, 11 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 01debc0..7f44e25 100644
--- a/debian/patches/01_do-not-use-embedded-python-six.patch
+++ b/debian/patches/01_do-not-use-embedded-python-six.patch
@@ -146,3 +146,14 @@ Last-Update: 2014-09-23
from urllib3.util.retry import Retry
from urllib3.exceptions import (
ConnectTimeoutError,
+--- a/test/__init__.py
++++ b/test/__init__.py
+@@ -7,7 +7,7 @@
+ 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