From: Senthil Kumaran Date: Mon, 28 Jun 2010 14:08:00 +0000 (+0000) Subject: Merged revisions 82324 via svnmerge from X-Git-Tag: v3.2a1~406 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8749a6347328b091a472d07305aaf82353dda3e8;p=python Merged revisions 82324 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r82324 | senthil.kumaran | 2010-06-28 19:26:46 +0530 (Mon, 28 Jun 2010) | 3 lines Fix Issue8653 - Docstring for urlunsplit function. ........ --- diff --git a/Lib/urllib/parse.py b/Lib/urllib/parse.py index 0b96b5b41d..ffb0ff72df 100644 --- a/Lib/urllib/parse.py +++ b/Lib/urllib/parse.py @@ -221,6 +221,11 @@ def urlunparse(components): return urlunsplit((scheme, netloc, url, query, fragment)) def urlunsplit(components): + """Combine the elements of a tuple as returned by urlsplit() into a + complete URL as a string. The data argument can be any five-item iterable. + This may result in a slightly different, but equivalent URL, if the URL that + was parsed originally had unnecessary delimiters (for example, a ? with an + empty query; the RFC states that these are equivalent).""" scheme, netloc, url, query, fragment = components if netloc or (scheme and scheme in uses_netloc and url[:2] != '//'): if url and url[:1] != '/': url = '/' + url