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

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

    Date: Saturday, June 23, 2012 @ 14:38:39
  Author: chaica-guest
Revision: 22249

  * debian/patches
    - add test_urlparse_uses_fragment.patch (Closes: #677801)

Added:
  packages/python-pip/trunk/debian/patches/test_urlparse_uses_fragment.patch
Modified:
  packages/python-pip/trunk/debian/changelog
  packages/python-pip/trunk/debian/patches/series

Modified: packages/python-pip/trunk/debian/changelog
===================================================================
--- packages/python-pip/trunk/debian/changelog	2012-06-23 14:22:28 UTC (rev 22248)
+++ packages/python-pip/trunk/debian/changelog	2012-06-23 14:38:39 UTC (rev 22249)
@@ -1,3 +1,10 @@
+python-pip (1.1-3) unstable; urgency=low
+
+  * debian/patches
+    - add test_urlparse_uses_fragment.patch (Closes: #677801)
+
+ -- Carl Chenet <chaica at debian.org>  Sat, 23 Jun 2012 16:18:21 +0200
+
 python-pip (1.1-2) unstable; urgency=low
 
   * debian/control

Modified: packages/python-pip/trunk/debian/patches/series
===================================================================
--- packages/python-pip/trunk/debian/patches/series	2012-06-23 14:22:28 UTC (rev 22248)
+++ packages/python-pip/trunk/debian/patches/series	2012-06-23 14:38:39 UTC (rev 22249)
@@ -1,2 +1,3 @@
 format_egg_string.patch
 remove_hardcoded_python_version.patch
+test_urlparse_uses_fragment.patch

Added: packages/python-pip/trunk/debian/patches/test_urlparse_uses_fragment.patch
===================================================================
--- packages/python-pip/trunk/debian/patches/test_urlparse_uses_fragment.patch	                        (rev 0)
+++ packages/python-pip/trunk/debian/patches/test_urlparse_uses_fragment.patch	2012-06-23 14:38:39 UTC (rev 22249)
@@ -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