From bbc0568a5c7d3849a22c78d545823a4b952c0933 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Mon, 14 Oct 2002 19:59:54 +0000 Subject: [PATCH] Fix for 1.33: urlsplit() should only add '//' if scheme != ''. Will add test and backport. --- Lib/test/test_urlparse.py | 7 ++++++- Lib/urlparse.py | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_urlparse.py b/Lib/test/test_urlparse.py index b821879397979d..39f50e4ac074fb 100644 --- a/Lib/test/test_urlparse.py +++ b/Lib/test/test_urlparse.py @@ -27,7 +27,12 @@ def test_frags(self): self.assertEqual(result2, url) def checkJoin(self, base, relurl, expected): - self.assertEqual(urlparse.urljoin(base, relurl), expected) + self.assertEqual(urlparse.urljoin(base, relurl), expected, + (base, relurl, expected)) + + def test_unparse_parse(self): + for u in ['Python', './Python']: + self.assertEqual(urlparse.urlunparse(urlparse.urlparse(u)), u) def test_RFC1808(self): # "normal" cases from RFC 1808: diff --git a/Lib/urlparse.py b/Lib/urlparse.py index 6361937a93191a..777b42f703735d 100644 --- 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: