From: Senthil Kumaran Date: Sun, 7 Nov 2010 13:10:02 +0000 (+0000) Subject: Merged revisions 86296 via svnmerge from X-Git-Tag: v2.7.1rc1~21 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=683beb6c9b3e1526b11f995af606400ddd195e90;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/urlparse.rst b/Doc/library/urlparse.rst index 26d422fd11..88dafa97c5 100644 --- a/Doc/library/urlparse.rst +++ b/Doc/library/urlparse.rst @@ -64,11 +64,10 @@ The :mod:`urlparse` module defines the following functions: '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')