summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSenthil Kumaran <orsenthil@gmail.com>2010-11-07 13:10:02 (GMT)
committerSenthil Kumaran <orsenthil@gmail.com>2010-11-07 13:10:02 (GMT)
commit683beb6c9b3e1526b11f995af606400ddd195e90 (patch)
treeeac31ac34756974cdced30d5b22970b90ea092f7
parent5edac047f11f8d6e22231d9922363f334c4f4b0e (diff)
downloadcpython-683beb6c9b3e1526b11f995af606400ddd195e90.zip
cpython-683beb6c9b3e1526b11f995af606400ddd195e90.tar.gz
cpython-683beb6c9b3e1526b11f995af606400ddd195e90.tar.bz2
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. ........
-rw-r--r--Doc/library/urlparse.rst9
1 files changed, 4 insertions, 5 deletions
diff --git a/Doc/library/urlparse.rst b/Doc/library/urlparse.rst
index 26d422f..88dafa9 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')