[Python-modules-commits] r22415 - in packages/python-virtualenv/trunk/debian (3 files)

[stefanor at users.alioth.debian.org]

    Date: Sunday, July 8, 2012 @ 19:18:59
  Author: stefanor
Revision: 22415

Apply test_urlparse_uses_fragment.patch to the bundled pip, allowing it to
work with Python >= 2.7.4 or >= 3.3. (Closes: #679337)

Added:
  packages/python-virtualenv/trunk/debian/pip-test_urlparse_uses_fragment.patch
Modified:
  packages/python-virtualenv/trunk/debian/changelog
  packages/python-virtualenv/trunk/debian/rules

Modified: packages/python-virtualenv/trunk/debian/changelog
===================================================================
--- packages/python-virtualenv/trunk/debian/changelog	2012-07-08 17:56:31 UTC (rev 22414)
+++ packages/python-virtualenv/trunk/debian/changelog	2012-07-08 19:18:59 UTC (rev 22415)
@@ -1,3 +1,10 @@
+python-virtualenv (1.7.1.2-2) UNRELEASED; urgency=low
+
+  * Apply test_urlparse_uses_fragment.patch to the bundled pip, allowing it to
+    work with Python >= 2.7.4 or >= 3.3. (Closes: #679337)
+
+ -- Stefano Rivera <stefanor at debian.org>  Sun, 08 Jul 2012 13:17:24 -0600
+
 python-virtualenv (1.7.1.2-1) unstable; urgency=low
 
   [ Clint Byrum ]

Added: packages/python-virtualenv/trunk/debian/pip-test_urlparse_uses_fragment.patch
===================================================================
--- packages/python-virtualenv/trunk/debian/pip-test_urlparse_uses_fragment.patch	                        (rev 0)
+++ packages/python-virtualenv/trunk/debian/pip-test_urlparse_uses_fragment.patch	2012-07-08 19:18:59 UTC (rev 22415)
@@ -0,0 +1,36 @@
+Description: fix the improper use of urllib.parse.uses_fragment
+Since  Python >= 2.7.3, 3.2.3 the module urlparse/urllib.parse (python3) do not
+have a uses_fragment attribute. This patch tests if it exists before using it.
+Origin: upstream
+Bug: https://github.com/pypa/pip/issues/552
+Bug-Debian: http://bugs.debian.org/677801
+Last-Update: 2012-06-19
+
+--- python-pip-1.1.orig/pip/vcs/__init__.py
++++ python-pip-1.1/pip/vcs/__init__.py
+@@ -19,7 +19,9 @@ class VcsSupport(object):
+     def __init__(self):
+         # Register more schemes with urlparse for various version control systems
+         urlparse.uses_netloc.extend(self.schemes)
+-        urlparse.uses_fragment.extend(self.schemes)
++        # Python >= 2.7.4, 3.3 doesn't have uses_fragment
++        if getattr(urlparse, 'uses_fragment', None):
++            urlparse.uses_fragment.extend(self.schemes)
+         super(VcsSupport, self).__init__()
+ 
+     def __iter__(self):
+--- python-pip-1.1.orig/pip/vcs/bazaar.py
++++ python-pip-1.1/pip/vcs/bazaar.py
+@@ -20,8 +20,10 @@ class Bazaar(VersionControl):
+ 
+     def __init__(self, url=None, *args, **kwargs):
+         super(Bazaar, self).__init__(url, *args, **kwargs)
+-        urlparse.non_hierarchical.extend(['lp'])
+-        urlparse.uses_fragment.extend(['lp'])
++        # Python >= 2.7.4, 3.3 doesn't have uses_fragment or non_hierarchical
++        if getattr(urlparse, 'uses_fragment', None):
++            urlparse.uses_fragment.extend(self.schemes)
++            urlparse.non_hierarchical.extend(['lp'])
+ 
+     def parse_vcs_bundle_file(self, content):
+         url = rev = None

Modified: packages/python-virtualenv/trunk/debian/rules
===================================================================
--- packages/python-virtualenv/trunk/debian/rules	2012-07-08 17:56:31 UTC (rev 22414)
+++ packages/python-virtualenv/trunk/debian/rules	2012-07-08 19:18:59 UTC (rev 22415)
@@ -4,6 +4,12 @@
 	dh $@ --with python2
 
 override_dh_auto_configure:
+	rm -f virtualenv_support/pip-1.1.debian1.tar.gz
+	# Patch pip 1.1
+	tar -xf virtualenv_support/pip-1.1.tar.gz
+	cd pip-1.1 && patch -p1 < ../debian/pip-test_urlparse_uses_fragment.patch
+	GZIP=--best tar --owner root --group root -cz \
+	                -f virtualenv_support/pip-1.1.debian1.tar.gz pip-1.1
 	# Rebuild the embedded parts, we may be quilt patching their sources
 	[ -e virtualenv.py.orig ] || cp virtualenv.py virtualenv.py.orig
 	python bin/rebuild-script.py
@@ -11,7 +17,12 @@
 
 override_dh_auto_clean:
 	[ ! -e virtualenv.py.orig ] || mv virtualenv.py.orig virtualenv.py
+	rm -rf pip-1.1 virtualenv_support/pip-1.1.debian1.tar.gz
 	dh_auto_clean
 
 override_dh_installchangelogs:
 	dh_installchangelogs docs/news.txt
+
+override_dh_install:
+	dh_install
+	rm debian/python-virtualenv/usr/share/python-virtualenv/pip-1.1.tar.gz