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

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

    Date: Wednesday, March 28, 2012 @ 23:40:45
  Author: eriol-guest
Revision: 20960

* New upstream release
* 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	2012-03-28 21:26:29 UTC (rev 20959)
+++ packages/python-urllib3/trunk/debian/changelog	2012-03-28 23:40:45 UTC (rev 20960)
@@ -1,3 +1,11 @@
+python-urllib3 (1.3-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * debian/patches/01_do-not-use-embedded-python-six.patch
+    - Refreshed
+
+ -- Daniele Tricoli <eriol at mornie.org>  Thu, 29 Mar 2012 01:38:35 +0200
+
 python-urllib3 (1.2.2-1) unstable; urgency=low
 
   * Initial release (Closes: #648783)

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	2012-03-28 21:26:29 UTC (rev 20959)
+++ packages/python-urllib3/trunk/debian/patches/01_do-not-use-embedded-python-six.patch	2012-03-28 23:40:45 UTC (rev 20960)
@@ -1,51 +1,62 @@
 Description: Do not use embedded copy of python-six.
 Author: Daniele Tricoli <eriol at mornie.org>
 Forwarded: not-needed
-Last-Update: 2012-02-10
+Last-Update: 2012-03-29
 
 --- a/test/test_collections.py
 +++ b/test/test_collections.py
 @@ -1,7 +1,7 @@
  import unittest
- 
+
  from urllib3._collections import RecentlyUsedContainer as Container
 -from urllib3.packages import six
 +import six
  xrange = six.moves.xrange
- 
- class TestLRUContainer(unittest.TestCase):
+
+
 --- a/urllib3/connectionpool.py
 +++ b/urllib3/connectionpool.py
-@@ -59,7 +59,7 @@
+@@ -51,7 +51,7 @@
  )
- 
+
  from .packages.ssl_match_hostname import match_hostname, CertificateError
 -from .packages import six
 +import six
- 
+
+
  xrange = six.moves.xrange
- 
 --- a/urllib3/filepost.py
 +++ b/urllib3/filepost.py
 @@ -14,8 +14,8 @@
- 
+
  from io import BytesIO
- 
+
 -from .packages import six
 -from .packages.six import b
 +import six
 +from six import b
- 
+
  writer = codecs.lookup('utf-8')[3]
- 
+
 --- a/urllib3/response.py
 +++ b/urllib3/response.py
 @@ -11,7 +11,7 @@
  from io import BytesIO
- 
+
  from .exceptions import HTTPError
 -from .packages.six import string_types as basestring
 +from six import string_types as basestring
- 
- 
+
+
  log = logging.getLogger(__name__)
+--- a/urllib3/util.py
++++ b/urllib3/util.py
+@@ -16,7 +16,7 @@
+     except ImportError: # `select` doesn't exist on AppEngine.
+         select = False
+
+-from .packages import six
++import six
+ from .exceptions import LocationParseError
+
+