Issue 1432. Fixes a bug caused because of the evolution
of the RFC that describes the behaviour. Note that we now
have the same behaviour than the current browsers.
diff --git a/Lib/urllib/parse.py b/Lib/urllib/parse.py
index fe02db5..3e00695 100644
--- a/Lib/urllib/parse.py
+++ b/Lib/urllib/parse.py
@@ -219,9 +219,18 @@
if path[:1] == '/':
return urlunparse((scheme, netloc, path,
params, query, fragment))
- if not (path or params or query):
- return urlunparse((scheme, netloc, bpath,
- bparams, bquery, fragment))
+ if not path:
+ path = bpath
+ if not params:
+ params = bparams
+ else:
+ path = path[:-1]
+ return urlunparse((scheme, netloc, path,
+ params, query, fragment))
+ if not query:
+ query = bquery
+ return urlunparse((scheme, netloc, path,
+ params, query, fragment))
segments = bpath.split('/')[:-1] + path.split('/')
# XXX The stuff below is bogus in various ways...
if segments[-1] == '.':