summaryrefslogtreecommitdiffstats
path: root/Lib/urlparse.py
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2002-10-14 19:59:54 (GMT)
committerGuido van Rossum <guido@python.org>2002-10-14 19:59:54 (GMT)
commitbbc0568a5c7d3849a22c78d545823a4b952c0933 (patch)
treec308697f61aeeaa5355147e63b144e97a75161bb /Lib/urlparse.py
parent6e75364cbe191710c056c437f2f0e29546625470 (diff)
downloadcpython-bbc0568a5c7d3849a22c78d545823a4b952c0933.zip
cpython-bbc0568a5c7d3849a22c78d545823a4b952c0933.tar.gz
cpython-bbc0568a5c7d3849a22c78d545823a4b952c0933.tar.bz2
Fix for 1.33: urlsplit() should only add '//' if scheme != ''.
Will add test and backport.
Diffstat (limited to 'Lib/urlparse.py')
-rw-r--r--Lib/urlparse.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/urlparse.py b/Lib/urlparse.py
index 6361937..777b42f 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: