summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorSenthil Kumaran <senthil@uthcode.com>2011-06-19 20:55:48 (GMT)
committerSenthil Kumaran <senthil@uthcode.com>2011-06-19 20:55:48 (GMT)
commita977acc0feabfe196f325321d7ea0c59bd9e64a4 (patch)
tree6493d2dafec2f17cfa417a138d911f457428c12f /Doc/library
parent409c32f47cc0e76c553f3d04c2698ebb21c512cb (diff)
parentfe9230aac6c85c31a5b0f9983599dcc01091b810 (diff)
downloadcpython-a977acc0feabfe196f325321d7ea0c59bd9e64a4.zip
cpython-a977acc0feabfe196f325321d7ea0c59bd9e64a4.tar.gz
cpython-a977acc0feabfe196f325321d7ea0c59bd9e64a4.tar.bz2
merge from 3.1 for issue issue12261.
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/urllib.parse.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/urllib.parse.rst b/Doc/library/urllib.parse.rst
index a6d7267..c77a679 100644
--- a/Doc/library/urllib.parse.rst
+++ b/Doc/library/urllib.parse.rst
@@ -61,7 +61,7 @@ or on combining URL components into a URL string.
input is presumed to be a relative URL and thus to start with
a path component.
- >>> from urlparse import urlparse
+ >>> from urllib.parse import urlparse
>>> urlparse('//www.cwi.nl:80/%7Eguido/Python.html')
ParseResult(scheme='', netloc='www.cwi.nl:80', path='/%7Eguido/Python.html',
params='', query='', fragment='')
@@ -537,7 +537,7 @@ task isn't already covered by the URL parsing functions above.
.. seealso::
:rfc:`3986` - Uniform Resource Identifiers
- This is the current standard (STD66). Any changes to urlparse module
+ This is the current standard (STD66). Any changes to urllib.parse module
should conform to this. Certain deviations could be observed, which are
mostly for backward compatibility purposes and for certain de-facto
parsing requirements as commonly observed in major browsers.