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

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

    Date: Wednesday, October 16, 2013 @ 10:55:59
  Author: eriol-guest
Revision: 26168

* debian/patches/01_do-not-use-embedded-python-six.patch
  - Refreshed

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	2013-10-16 09:31:47 UTC (rev 26167)
+++ packages/python-urllib3/trunk/debian/changelog	2013-10-16 10:55:59 UTC (rev 26168)
@@ -1,6 +1,8 @@
 python-urllib3 (1.7.1-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * debian/patches/01_do-not-use-embedded-python-six.patch
+    - Refreshed
 
  -- Daniele Tricoli <eriol at mornie.org>  Wed, 16 Oct 2013 11:30:49 +0200
 

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	2013-10-16 09:31:47 UTC (rev 26167)
+++ packages/python-urllib3/trunk/debian/patches/01_do-not-use-embedded-python-six.patch	2013-10-16 10:55:59 UTC (rev 26168)
@@ -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: 2013-05-07
+Last-Update: 2013-10-16
 
 --- a/test/test_collections.py
 +++ b/test/test_collections.py
@@ -16,15 +16,15 @@
  
 --- a/urllib3/connectionpool.py
 +++ b/urllib3/connectionpool.py
-@@ -54,7 +54,7 @@
+@@ -55,7 +55,7 @@
+     ProxyError,
  )
- 
- from .packages.ssl_match_hostname import match_hostname, CertificateError
+ from .packages.ssl_match_hostname import CertificateError, match_hostname
 -from .packages import six
 +import six
- 
- 
- xrange = six.moves.xrange
+ from .request import RequestMethods
+ from .response import HTTPResponse
+ from .util import (
 --- a/urllib3/filepost.py
 +++ b/urllib3/filepost.py
 @@ -10,8 +10,8 @@
@@ -35,37 +35,37 @@
 -from .packages.six import b
 +import six
 +from six import b
+ from .fields import RequestField
  
  writer = codecs.lookup('utf-8')[3]
- 
 --- a/urllib3/response.py
 +++ b/urllib3/response.py
-@@ -9,7 +9,7 @@
- import zlib
+@@ -10,7 +10,7 @@
+ import io
  
  from .exceptions import DecodeError
 -from .packages.six import string_types as basestring, binary_type
 +from six import string_types as basestring, binary_type
+ from .util import is_fp_closed
  
  
- log = logging.getLogger(__name__)
 --- a/urllib3/util.py
 +++ b/urllib3/util.py
 @@ -32,7 +32,7 @@
+ except ImportError:
      pass
  
- 
 -from .packages import six
 +import six
- from .exceptions import LocationParseError, SSLError
+ from .exceptions import LocationParseError, SSLError, TimeoutStateError
  
  
 --- a/test/test_filepost.py
 +++ b/test/test_filepost.py
-@@ -1,7 +1,7 @@
- import unittest
+@@ -2,7 +2,7 @@
  
  from urllib3.filepost import encode_multipart_formdata, iter_fields
+ from urllib3.fields import RequestField
 -from urllib3.packages.six import b, u
 +from six import b, u