mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-15 03:10:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merged revisions 87329 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r87329 | senthil.kumaran | 2010-12-17 12:48:45 +0800 (Fri, 17 Dec 2010) | 3 lines

  Fix Issue9721 - urljoin behavior when the relative url starts with ';'
........
This commit is contained in:
Senthil Kumaran 2010-12-17 04:54:43 +00:00
parent 115a3170c4
commit 3396e8671d
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Lib/urllib/parse.py
View file

@ -249,14 +249,9 @@ def urljoin(base, url, allow_fragments=True):
if path[:1] == '/':
return urlunparse((scheme, netloc, path,
params, query, fragment))
if not path:
if not path and not params:
path = bpath
if not params:
params = bparams
else:
path = path[:-1]
return urlunparse((scheme, netloc, path,
params, query, fragment))
params = bparams
if not query:
query = bquery
return urlunparse((scheme, netloc, path,