From: Senthil Kumaran Date: Mon, 28 Jun 2010 14:12:18 +0000 (+0000) Subject: Merged revisions 82326 via svnmerge from X-Git-Tag: v3.1.3rc1~579 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=930049bda96c74c39db004c9045e5f0f9498ce35;p=python Merged revisions 82326 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r82326 | senthil.kumaran | 2010-06-28 19:38:00 +0530 (Mon, 28 Jun 2010) | 9 lines 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 1ac6f4dff6..b7890d84dd 100644 --- a/Lib/urllib/parse.py +++ b/Lib/urllib/parse.py @@ -208,6 +208,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