[Python-checkins] r86297 - in python/branches/release31-maint: Doc/library/urllib.parse.rst

[senthil.kumaran]

Author: senthil.kumaran
Date: Sun Nov  7 14:07:14 2010
New Revision: 86297

Log:
Merged revisions 86296 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86296 | senthil.kumaran | 2010-11-07 20:57:04 +0800 (Sun, 07 Nov 2010) | 3 lines
  
  Fix Issue10226 - Clarifying the role of the netloc separator.
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Doc/library/urllib.parse.rst

Modified: python/branches/release31-maint/Doc/library/urllib.parse.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/urllib.parse.rst	(original)
+++ python/branches/release31-maint/Doc/library/urllib.parse.rst	Sun Nov  7 14:07:14 2010
@@ -48,11 +48,10 @@
       >>> o.geturl()
       'http://www.cwi.nl:80/%7Eguido/Python.html'
 
-   If the scheme value is not specified, urlparse expects the netloc value to
-   start with '//', following the syntax specifications from :rfc:`1808`.
-   Otherwise, it is not possible to distinguish between netloc and path
-   components, and would the indistinguishable component would be classified
-   as the path as in a relative URL.
+   Following the syntax specifications in :rfc:`1808`, urlparse recognizes
+   a netloc only if it is properly introduced by '//'.  Otherwise the
+   input is presumed to be a relative URL and thus to start with
+   a path component.
 
        >>> from urlparse import urlparse
        >>> urlparse('//www.cwi.nl:80/%7Eguido/Python.html')