Backporting urlparse.py:1.34, test_urlparse.py:1.8:

Fix for 1.33: urlsplit() should only add '//' if scheme != ''.
[SF bug 620705]

diff --git a/Lib/test/test_urlparse.py b/Lib/test/test_urlparse.py
index 7651afab85f7bd2bec7823cb36268af774a1b924..3ad49ef7f299b27c1677c7625692b07864712d73 100644 (file)
--- a/Lib/test/test_urlparse.py
+++ b/Lib/test/test_urlparse.py
@@ -87,3 +87,8 @@ checkJoin('g/../h', 'http://a/b/c/h')
 #checkJoin('http:', 'http:')
 
 print errors, "errors"
+
+# One more test backported from 2.3
+for u in ['Python', './Python']:
+    if urlparse.urlunparse(urlparse.urlparse(u)) != u:
+        print "*** urlparse/urlunparse failure for", `u`

diff --git a/Lib/urlparse.py b/Lib/urlparse.py
index 6361937a93191a23ae1c6ebcbcdf5c1e30beecb9..777b42f703735dce43b436ee08e8261e141104f7 100644 (file)
--- a/Lib/urlparse.py
+++ b/Lib/urlparse.py
@@ -128,7 +128,7 @@ def urlunparse((scheme, netloc, url, params, query, fragment)):
     return urlunsplit((scheme, netloc, url, query, fragment))
 
 def urlunsplit((scheme, netloc, url, query, fragment)):
-    if netloc or (scheme in uses_netloc and url[:2] != '//'):
+    if netloc or (scheme and scheme in uses_netloc and url[:2] != '//'):
         if url and url[:1] != '/': url = '/' + url
         url = '//' + (netloc or '') + url
     if scheme: