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

2 files changed, 20 insertions, 18 deletions

diff --git a/debian/changelog b/debian/changelog
index 5ad9464..ba7b433 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 python-urllib3 (1.9-1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * debian/patches/01_do-not-use-embedded-python-six.patch
+    - Refresh
 
- -- Daniele Tricoli <eriol@mornie.org>  Mon, 01 Sep 2014 00:27:23 +0200
+ -- Daniele Tricoli <eriol@mornie.org>  Mon, 01 Sep 2014 00:42:17 +0200
 
 python-urllib3 (1.8.3-1) unstable; urgency=medium
 
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 024180f..6a6f7f9 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-07-7
+Last-Update: 2014-09-01
 
 --- a/test/test_collections.py
 +++ b/test/test_collections.py
@@ -16,8 +16,8 @@ Last-Update: 2014-07-7
  
 --- a/urllib3/connectionpool.py
 +++ b/urllib3/connectionpool.py
-@@ -31,7 +31,7 @@
-     ProxyError,
+@@ -27,7 +27,7 @@
+     InsecureRequestWarning,
  )
  from .packages.ssl_match_hostname import CertificateError
 -from .packages import six
@@ -27,7 +27,7 @@ Last-Update: 2014-07-7
      DummyConnection,
 --- a/urllib3/filepost.py
 +++ b/urllib3/filepost.py
-@@ -9,8 +9,8 @@
+@@ -3,8 +3,8 @@
  from uuid import uuid4
  from io import BytesIO
  
@@ -40,14 +40,14 @@ Last-Update: 2014-07-7
  writer = codecs.lookup('utf-8')[3]
 --- a/urllib3/response.py
 +++ b/urllib3/response.py
-@@ -11,7 +11,7 @@
+@@ -4,7 +4,7 @@
  
  from ._collections import HTTPHeaderDict
- from .exceptions import DecodeError, ReadTimeoutError
+ 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
- from .util import is_fp_closed
- 
+ from .connection import HTTPException, BaseSSLError
+ from .util.response import is_fp_closed
  
 --- a/test/test_filepost.py
 +++ b/test/test_filepost.py
@@ -62,7 +62,7 @@ Last-Update: 2014-07-7
  BOUNDARY = '!! test boundary !!'
 --- a/dummyserver/handlers.py
 +++ b/dummyserver/handlers.py
-@@ -190,7 +190,7 @@
+@@ -211,7 +211,7 @@
      """
      import tornado.httputil
      import email.utils
@@ -73,7 +73,7 @@ Last-Update: 2014-07-7
      parts = tornado.httputil._parseparam(';' + line)
 --- a/urllib3/fields.py
 +++ b/urllib3/fields.py
-@@ -7,7 +7,7 @@
+@@ -1,7 +1,7 @@
  import email.utils
  import mimetypes
  
@@ -95,7 +95,7 @@ Last-Update: 2014-07-7
  class TestRequestField(unittest.TestCase):
 --- a/urllib3/_collections.py
 +++ b/urllib3/_collections.py
-@@ -20,7 +20,7 @@
+@@ -14,7 +14,7 @@
      from collections import OrderedDict
  except ImportError:
      from .packages.ordered_dict import OrderedDict
@@ -106,22 +106,22 @@ Last-Update: 2014-07-7
  __all__ = ['RecentlyUsedContainer', 'HTTPHeaderDict']
 --- a/urllib3/connection.py
 +++ b/urllib3/connection.py
-@@ -34,7 +34,7 @@
+@@ -28,7 +28,7 @@
      ConnectTimeoutError,
  )
  from .packages.ssl_match_hostname import match_hostname
 -from .packages import six
 +import six
- from .util import (
-     assert_fingerprint,
+ 
+ from .util.ssl_ import (
      resolve_cert_reqs,
 --- a/urllib3/util/request.py
 +++ b/urllib3/util/request.py
 @@ -1,6 +1,6 @@
  from base64 import b64encode
  
--from ..packages import six
-+import six
- 
+-from ..packages.six import b
++from six import b
  
  ACCEPT_ENCODING = 'gzip,deflate'
+