mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-28 01:00:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

merge from 3.1 for issue issue12261.

Browse source
This commit is contained in:
Senthil Kumaran 2011-06-19 13:55:48 -07:00
commit a977acc0fe
1 changed files with 2 additions and 2 deletions
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 input is presumed to be a relative URL and thus to start with
a path component. a path component.
>>> from urlparse import urlparse >>> from urllib.parse import urlparse
>>> urlparse('//www.cwi.nl:80/%7Eguido/Python.html') >>> urlparse('//www.cwi.nl:80/%7Eguido/Python.html')
ParseResult(scheme='', netloc='www.cwi.nl:80', path='/%7Eguido/Python.html', ParseResult(scheme='', netloc='www.cwi.nl:80', path='/%7Eguido/Python.html',
params='', query='', fragment='') params='', query='', fragment='')
@ -537,7 +537,7 @@ task isn't already covered by the URL parsing functions above.
.. seealso:: .. seealso::
:rfc:`3986` - Uniform Resource Identifiers :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 should conform to this. Certain deviations could be observed, which are
mostly for backward compatibility purposes and for certain de-facto mostly for backward compatibility purposes and for certain de-facto
parsing requirements as commonly observed in major browsers. parsing requirements as commonly observed in major browsers.