[Python-checkins] r82325 - in python/branches/release26-maint: Lib/urlparse.py

[senthil.kumaran]

Author: senthil.kumaran
Date: Mon Jun 28 15:59:49 2010
New Revision: 82325

Log:
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.
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/urlparse.py

Modified: python/branches/release26-maint/Lib/urlparse.py
==============================================================================
--- python/branches/release26-maint/Lib/urlparse.py	(original)
+++ python/branches/release26-maint/Lib/urlparse.py	Mon Jun 28 15:59:49 2010
@@ -206,6 +206,11 @@
     return urlunsplit((scheme, netloc, url, query, fragment))
 
 def urlunsplit(data):
+    """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 = data
     if netloc or (scheme and scheme in uses_netloc and url[:2] != '//'):
         if url and url[:1] != '/': url = '/' + url