Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

merge from 3.2

This commit is contained in:
Senthil Kumaran 2011-06-19 13:56:56 -07:00
parent 54bb1e6aaf a977acc0fe
commit 8ae34b46c7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Doc/library/urllib.parse.rst
View File

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