diff options
| author | Brett Cannon <bcannon@gmail.com> | 2003-10-12 04:29:10 (GMT) |
|---|---|---|
| committer | Brett Cannon <bcannon@gmail.com> | 2003-10-12 04:29:10 (GMT) |
| commit | 8da2a52dd65a008965835f760997d2b58b7e197c (patch) | |
| tree | cf2de86a11bb1db1fedb4932d95cede645864c2a /Lib | |
| parent | 82860df4171b6b904bd64904291541f3c9642245 (diff) | |
| download | cpython-8da2a52dd65a008965835f760997d2b58b7e197c.zip cpython-8da2a52dd65a008965835f760997d2b58b7e197c.tar.gz cpython-8da2a52dd65a008965835f760997d2b58b7e197c.tar.bz2 | |
See rev. 1.42 for log message
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/urlparse.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Lib/urlparse.py b/Lib/urlparse.py index 69305a7..2f1965a 100644 --- a/Lib/urlparse.py +++ b/Lib/urlparse.py @@ -157,13 +157,9 @@ def urljoin(base, url, allow_fragments = 1): if path[:1] == '/': return urlunparse((scheme, netloc, path, params, query, fragment)) - if not path: - if not params: - params = bparams - if not query: - query = bquery + if not (path or params or query): return urlunparse((scheme, netloc, bpath, - params, query, fragment)) + bparams, bquery, fragment)) segments = bpath.split('/')[:-1] + path.split('/') # XXX The stuff below is bogus in various ways... if segments[-1] == '.': |