[Python-modules-commits] r20848 - in packages/requests/trunk/debian (5 files)

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

    Date: Sunday, March 18, 2012 @ 23:47:04
  Author: eriol-guest
Revision: 20848

Removed embedded copy of python-six

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

Modified: packages/requests/trunk/debian/changelog
===================================================================
--- packages/requests/trunk/debian/changelog	2012-03-18 22:00:32 UTC (rev 20847)
+++ packages/requests/trunk/debian/changelog	2012-03-18 23:47:04 UTC (rev 20848)
@@ -5,6 +5,11 @@
 
   [ Daniele Tricoli ]
   * New upstream release (Closes: #663561)
+  * Removed embedded copy of python-six
+    - Added debian/patches/02_do-not-use-embedded-python-six.patch
+    - Added override_dh_auto_configure to debian/rules to remove
+      the embedded copy
+    - Added python(3)-six to Depends
   * debian/control
     - Bumped Standards-Version to 3.9.3 (no changes needed)
   * debian/patches/01_do-not-use-python-certifi.patch
@@ -12,7 +17,7 @@
   * debian/patches/02_fix-python3-except-sintax-error.patch
     - Removed as it is applied upstream
 
- -- Daniele Tricoli <eriol at mornie.org>  Fri, 16 Mar 2012 19:37:44 +0100
+ -- Daniele Tricoli <eriol at mornie.org>  Mon, 19 Mar 2012 00:35:09 +0100
 
 requests (0.10.1-1) unstable; urgency=low
 

Modified: packages/requests/trunk/debian/control
===================================================================
--- packages/requests/trunk/debian/control	2012-03-18 22:00:32 UTC (rev 20847)
+++ packages/requests/trunk/debian/control	2012-03-18 23:47:04 UTC (rev 20848)
@@ -19,7 +19,8 @@
 Depends:
  ${misc:Depends},
  ${python:Depends},
- ca-certificates
+ ca-certificates,
+ python-six
 Recommends:
  python-chardet,
  python-gevent
@@ -49,7 +50,8 @@
 Depends:
  ${misc:Depends},
  ${python3:Depends},
- ca-certificates
+ ca-certificates,
+ python3-six
 Description: elegant and simple HTTP library for Python3, built for human beings
  Requests allow you to send GET, HEAD, PUT, POST, and DELETE
  HTTP requests. You can add headers, form data, multipart files, and

Added: 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	                        (rev 0)
+++ packages/requests/trunk/debian/patches/02_do-not-use-embedded-python-six.patch	2012-03-18 23:47:04 UTC (rev 20848)
@@ -0,0 +1,40 @@
+Description: Do not use embedded copy of python-six.
+Author: Daniele Tricoli <eriol at mornie.org>
+Forwarded: not-needed
+Last-Update: 2012-03-19
+
+--- a/requests/packages/urllib3/connectionpool.py
++++ b/requests/packages/urllib3/connectionpool.py
+@@ -59,7 +59,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 @@
+
+ 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/requests/packages/urllib3/response.py
++++ b/requests/packages/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__)

Modified: packages/requests/trunk/debian/patches/series
===================================================================
--- packages/requests/trunk/debian/patches/series	2012-03-18 22:00:32 UTC (rev 20847)
+++ packages/requests/trunk/debian/patches/series	2012-03-18 23:47:04 UTC (rev 20848)
@@ -1 +1,2 @@
 01_do-not-use-python-certifi.patch
+02_do-not-use-embedded-python-six.patch

Modified: packages/requests/trunk/debian/rules
===================================================================
--- packages/requests/trunk/debian/rules	2012-03-18 22:00:32 UTC (rev 20847)
+++ packages/requests/trunk/debian/rules	2012-03-18 23:47:04 UTC (rev 20848)
@@ -16,6 +16,9 @@
 	rm -rf build
 	dh_auto_clean
 
+override_dh_auto_configure:
+	rm requests/packages/urllib3/packages/six.py
+
 override_dh_auto_install:
 	set -ex; \
 	for python in $(PYVERS); do \