aboutsummaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
authorDaniele Tricoli <eriol@mornie.org>2015-05-03 14:52:06 +0000
committerDaniele Tricoli <eriol@mornie.org>2015-05-03 14:52:06 +0000
commit2696e35c4311352ac692f57dd37a2fbb5d0971de (patch)
tree54e95a6046287afc7b0ce1bede8a7b178447c264 /debian/patches
parent6ba3e805f373ac48eaae23c866441b007aa3d24e (diff)
downloadpython-urllib3-2696e35c4311352ac692f57dd37a2fbb5d0971de.tar
python-urllib3-2696e35c4311352ac692f57dd37a2fbb5d0971de.tar.gz
Refresh 01_do-not-use-embedded-python-six.patch
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/01_do-not-use-embedded-python-six.patch20
1 files changed, 10 insertions, 10 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 62a5a51..2ad8061 100644
--- a/debian/patches/01_do-not-use-embedded-python-six.patch
+++ b/debian/patches/01_do-not-use-embedded-python-six.patch
@@ -1,7 +1,7 @@
Description: Do not use embedded copy of python-six.
Author: Daniele Tricoli <eriol@mornie.org>
Forwarded: not-needed
-Last-Update: 2014-12-31
+Last-Update: 2015-05-03
--- a/test/test_collections.py
+++ b/test/test_collections.py
@@ -13,7 +13,7 @@ Last-Update: 2014-12-31
+import six
xrange = six.moves.xrange
-
+ from nose.plugins.skip import SkipTest
--- a/urllib3/connectionpool.py
+++ b/urllib3/connectionpool.py
@@ -27,7 +27,7 @@
@@ -40,12 +40,12 @@ Last-Update: 2014-12-31
writer = codecs.lookup('utf-8')[3]
--- a/urllib3/response.py
+++ b/urllib3/response.py
-@@ -4,7 +4,7 @@
-
- from ._collections import HTTPHeaderDict
- from .exceptions import ProtocolError, DecodeError, ReadTimeoutError
--from .packages.six import string_types as basestring, binary_type
-+from six import string_types as basestring, binary_type
+@@ -10,7 +10,7 @@
+ from .exceptions import (
+ ProtocolError, DecodeError, ReadTimeoutError, ResponseNotChunked
+ )
+-from .packages.six import string_types as basestring, binary_type, PY3
++from six import string_types as basestring, binary_type, PY3
from .connection import HTTPException, BaseSSLError
from .util.response import is_fp_closed
@@ -99,8 +99,8 @@ Last-Update: 2014-12-31
from collections import OrderedDict
except ImportError:
from .packages.ordered_dict import OrderedDict
--from .packages.six import iterkeys, itervalues
-+from six import iterkeys, itervalues
+-from .packages.six import iterkeys, itervalues, PY3
++from six import iterkeys, itervalues, PY3
__all__ = ['RecentlyUsedContainer', 'HTTPHeaderDict']