diff options
Diffstat (limited to 'debian/patches/01_do-not-use-embedded-python-six.patch')
| -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 |