[Python-checkins] r86298 - in python/branches/release27-maint: Doc/library/urlparse.rst

[senthil.kumaran]

Author: senthil.kumaran
Date: Sun Nov  7 14:10:02 2010
New Revision: 86298

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/release27-maint/   (props changed)
   python/branches/release27-maint/Doc/library/urlparse.rst

Modified: python/branches/release27-maint/Doc/library/urlparse.rst
==============================================================================
--- python/branches/release27-maint/Doc/library/urlparse.rst	(original)
+++ python/branches/release27-maint/Doc/library/urlparse.rst	Sun Nov  7 14:10:02 2010
@@ -64,11 +64,10 @@
       'http://www.cwi.nl:80/%7Eguido/Python.html'
 
 
-   If the scheme value is not specified, urlparse following the syntax
-   specifications from RFC 1808, expects the netloc value to start with '//',
-   Otherwise, it is not possible to distinguish between net_loc and path
-   component and would classify the indistinguishable component as 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')