[Python-modules-commits] r31641 - in packages/python-urllib3/trunk/debian (2 files)

[eriol-guest at users.alioth.debian.org]

    Date: Wednesday, December 31, 2014 @ 17:40:10
  Author: eriol-guest
Revision: 31641

Refresh 01_do-not-use-embedded-python-six.patch

Modified:
  packages/python-urllib3/trunk/debian/changelog
  packages/python-urllib3/trunk/debian/patches/01_do-not-use-embedded-python-six.patch

Modified: packages/python-urllib3/trunk/debian/changelog
===================================================================
--- packages/python-urllib3/trunk/debian/changelog	2014-12-31 12:43:02 UTC (rev 31640)
+++ packages/python-urllib3/trunk/debian/changelog	2014-12-31 17:40:10 UTC (rev 31641)
@@ -1,8 +1,10 @@
 python-urllib3 (1.10-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * debian/patches/01_do-not-use-embedded-python-six.patch
+    - Refresh.
 
- -- Daniele Tricoli <eriol at mornie.org>  Wed, 31 Dec 2014 13:42:51 +0100
+ -- Daniele Tricoli <eriol at mornie.org>  Wed, 31 Dec 2014 18:24:49 +0100
 
 python-urllib3 (1.9.1-3) unstable; urgency=medium
 

Modified: packages/python-urllib3/trunk/debian/patches/01_do-not-use-embedded-python-six.patch
===================================================================
--- packages/python-urllib3/trunk/debian/patches/01_do-not-use-embedded-python-six.patch	2014-12-31 12:43:02 UTC (rev 31640)
+++ packages/python-urllib3/trunk/debian/patches/01_do-not-use-embedded-python-six.patch	2014-12-31 17:40:10 UTC (rev 31641)
@@ -1,7 +1,7 @@
 Description: Do not use embedded copy of python-six.
 Author: Daniele Tricoli <eriol at 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 @@
      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 @@
  
 --- 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 @@
  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