diff options
| author | Daniele Tricoli <eriol@mornie.org> | 2014-12-31 17:40:10 +0000 |
|---|---|---|
| committer | Daniele Tricoli <eriol@mornie.org> | 2014-12-31 17:40:10 +0000 |
| commit | 46d20441e9abdc646f5709c47f6a1dad3cee72fc (patch) | |
| tree | 36e7797dc89cfa6a9c194ae16bdb10a2f289e6e6 /debian/patches | |
| parent | 21a9c50bde3c4cd7bc652d79066a0ffbb5cc25fd (diff) | |
| download | python-urllib3-46d20441e9abdc646f5709c47f6a1dad3cee72fc.tar python-urllib3-46d20441e9abdc646f5709c47f6a1dad3cee72fc.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.patch | 13 |
1 files changed, 7 insertions, 6 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 a7a0716..62a5a51 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-09-23 +Last-Update: 2014-12-31 --- a/test/test_collections.py +++ b/test/test_collections.py @@ -99,8 +99,8 @@ Last-Update: 2014-09-23 from collections import OrderedDict except ImportError: from .packages.ordered_dict import OrderedDict --from .packages.six import itervalues -+from six import itervalues +-from .packages.six import iterkeys, itervalues ++from six import iterkeys, itervalues __all__ = ['RecentlyUsedContainer', 'HTTPHeaderDict'] @@ -127,9 +127,9 @@ Last-Update: 2014-09-23 --- a/urllib3/util/retry.py +++ b/urllib3/util/retry.py -@@ -7,7 +7,7 @@ +@@ -8,7 +8,7 @@ ReadTimeoutError, - MaxRetryError, + ResponseError, ) -from ..packages import six +import six @@ -138,9 +138,10 @@ Last-Update: 2014-09-23 log = logging.getLogger(__name__) --- a/test/test_retry.py +++ b/test/test_retry.py -@@ -1,6 +1,6 @@ +@@ -1,7 +1,7 @@ import unittest + from urllib3.response import HTTPResponse -from urllib3.packages.six.moves import xrange +from six.moves import xrange from urllib3.util.retry import Retry |