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 1ac6f4dff6d9d414c54f07be9dfc6889fb93387e..b7890d84dd9ab97d8d2a6ad7b7a9348b93589e0e 100644 (file)
--- 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