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

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

    Date: Saturday, May 24, 2014 @ 14:25:34
  Author: eriol-guest
Revision: 29050

Refreshed 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-05-24 10:59:38 UTC (rev 29049)
+++ packages/python-urllib3/trunk/debian/changelog	2014-05-24 14:25:34 UTC (rev 29050)
@@ -1,8 +1,10 @@
 python-urllib3 (1.8.2-1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * debian/patches/01_do-not-use-embedded-python-six.patch
+    - Refreshed
 
- -- Daniele Tricoli <eriol at mornie.org>  Sat, 24 May 2014 11:07:10 +0200
+ -- Daniele Tricoli <eriol at mornie.org>  Sat, 24 May 2014 16:24:14 +0200
 
 python-urllib3 (1.8-2) 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-05-24 10:59:38 UTC (rev 29049)
+++ packages/python-urllib3/trunk/debian/patches/01_do-not-use-embedded-python-six.patch	2014-05-24 14:25:34 UTC (rev 29050)
@@ -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-03-31
+Last-Update: 2014-05-24
 
 --- a/test/test_collections.py
 +++ b/test/test_collections.py
@@ -16,7 +16,7 @@
  
 --- a/urllib3/connectionpool.py
 +++ b/urllib3/connectionpool.py
-@@ -30,7 +30,7 @@
+@@ -32,7 +32,7 @@
      ProxyError,
  )
  from .packages.ssl_match_hostname import CertificateError
@@ -49,17 +49,6 @@
  from .util import is_fp_closed
  
  
---- 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, TimeoutStateError
- 
- 
 --- a/test/test_filepost.py
 +++ b/test/test_filepost.py
 @@ -2,7 +2,7 @@
@@ -73,7 +62,7 @@
  BOUNDARY = '!! test boundary !!'
 --- a/dummyserver/handlers.py
 +++ b/dummyserver/handlers.py
-@@ -186,7 +186,7 @@
+@@ -190,7 +190,7 @@
      """
      import tornado.httputil
      import email.utils
@@ -126,3 +115,13 @@
  from .util import (
      assert_fingerprint,
      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
+ 
+ 
+ ACCEPT_ENCODING = 'gzip,deflate'