summaryrefslogtreecommitdiff
path: root/Doc/library/urllib.parse.rst
diff options
context:
space:
mode:
authorSenthil Kumaran <orsenthil@gmail.com>2010-11-07 13:07:14 +0000
committerSenthil Kumaran <orsenthil@gmail.com>2010-11-07 13:07:14 +0000
commite4be72197fca26e8530eea05c2d87764532c2a88 (patch)
tree5232ac0927e0c2e13ff8ede57c6f1f564b2f7979 /Doc/library/urllib.parse.rst
parentbee54f53b1162d2229e15e30156e7f5516cf82ae (diff)
downloadcpython-git-e4be72197fca26e8530eea05c2d87764532c2a88.tar.gz
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. ........
Diffstat (limited to 'Doc/library/urllib.parse.rst')
-rw-r--r--Doc/library/urllib.parse.rst9
1 files changed, 4 insertions, 5 deletions
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')