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

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

    Date: Sunday, May 3, 2015 @ 14:52:06
  Author: eriol-guest
Revision: 32566

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	2015-05-03 13:51:59 UTC (rev 32565)
+++ packages/python-urllib3/trunk/debian/changelog	2015-05-03 14:52:06 UTC (rev 32566)
@@ -3,8 +3,10 @@
   * New upstream release.
   * debian/watch
     - Use pypi.debian.net redirector.
+  * debian/patches/01_do-not-use-embedded-python-six.patch
+    - Refresh.
 
- -- Daniele Tricoli <eriol at mornie.org>  Sun, 03 May 2015 15:49:16 +0200
+ -- Daniele Tricoli <eriol at mornie.org>  Sun, 03 May 2015 16:51:02 +0200
 
 python-urllib3 (1.10-1) experimental; 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	2015-05-03 13:51:59 UTC (rev 32565)
+++ packages/python-urllib3/trunk/debian/patches/01_do-not-use-embedded-python-six.patch	2015-05-03 14:52:06 UTC (rev 32566)
@@ -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-12-31
+Last-Update: 2015-05-03
 
 --- a/test/test_collections.py
 +++ b/test/test_collections.py
@@ -13,7 +13,7 @@
 +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 @@
  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 @@
      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']