From: Senthil Kumaran <orsenthil@gmail.com>
Date: Sun, 7 Nov 2010 13:07:14 +0000 (+0000)
Subject: Merged revisions 86296 via svnmerge from
X-Git-Tag: v3.1.3rc1~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e4be72197fca26e8530eea05c2d87764532c2a88;p=python

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

diff --git a/Doc/library/urllib.parse.rst b/Doc/library/urllib.parse.rst
index 3e1c628296..0ed27ba409 100644
--- a/Doc/library/urllib.parse.rst
+++ b/Doc/library/urllib.parse.rst
@@ -48,11 +48,10 @@ The :mod:`urllib.parse` module defines the following functions:
       >>> 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')