[Python-modules-commits] r20995 - in packages/requests/trunk/debian (2 files)

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

    Date: Sunday, April 1, 2012 @ 09:33:32
  Author: eriol-guest
Revision: 20995

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

Modified:
  packages/requests/trunk/debian/changelog
  packages/requests/trunk/debian/patches/02_do-not-use-embedded-python-six.patch

Modified: packages/requests/trunk/debian/changelog
===================================================================
--- packages/requests/trunk/debian/changelog	2012-04-01 08:12:37 UTC (rev 20994)
+++ packages/requests/trunk/debian/changelog	2012-04-01 09:33:32 UTC (rev 20995)
@@ -1,8 +1,10 @@
 requests (0.11.1-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * debian/patches/02_do-not-use-embedded-python-six.patch
+    - Refreshed
 
- -- Daniele Tricoli <eriol at mornie.org>  Sun, 01 Apr 2012 09:56:20 +0200
+ -- Daniele Tricoli <eriol at mornie.org>  Sun, 01 Apr 2012 11:32:04 +0200
 
 requests (0.10.8-1) unstable; urgency=low
 

Modified: packages/requests/trunk/debian/patches/02_do-not-use-embedded-python-six.patch
===================================================================
--- packages/requests/trunk/debian/patches/02_do-not-use-embedded-python-six.patch	2012-04-01 08:12:37 UTC (rev 20994)
+++ packages/requests/trunk/debian/patches/02_do-not-use-embedded-python-six.patch	2012-04-01 09:33:32 UTC (rev 20995)
@@ -5,15 +5,15 @@
 
 --- a/requests/packages/urllib3/connectionpool.py
 +++ b/requests/packages/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/requests/packages/urllib3/filepost.py
 +++ b/requests/packages/urllib3/filepost.py
 @@ -14,8 +14,8 @@
@@ -38,3 +38,12 @@
 
 
  log = logging.getLogger(__name__)
+--- a/requests/packages/urllib3/util.py
++++ b/requests/packages/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