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

Issue 8818: urlparse/urlsplit keyword is 'scheme', not 'default_scheme'.

This commit is contained in:
R. David Murray 2010-05-25 15:32:06 +00:00
parent bfbdefe539
commit 172e06e019
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Doc/library/urlparse.rst
View File

@ -36,7 +36,7 @@ following URL schemes: ``file``, ``ftp``, ``gopher``, ``hdl``, ``http``,
The :mod:`urlparse` module defines the following functions: The :mod:`urlparse` module defines the following functions:
.. function:: urlparse(urlstring[, default_scheme[, allow_fragments]]) .. function:: urlparse(urlstring[, scheme[, allow_fragments]])
Parse a URL into six components, returning a 6-tuple. This corresponds to the Parse a URL into six components, returning a 6-tuple. This corresponds to the
general structure of a URL: ``scheme://netloc/path;parameters?query#fragment``. general structure of a URL: ``scheme://netloc/path;parameters?query#fragment``.
@ -58,7 +58,7 @@ The :mod:`urlparse` module defines the following functions:
>>> o.geturl() >>> o.geturl()
'http://www.cwi.nl:80/%7Eguido/Python.html' 'http://www.cwi.nl:80/%7Eguido/Python.html'
If the *default_scheme* argument is specified, it gives the default addressing If the *scheme* argument is specified, it gives the default addressing
scheme, to be used only if the URL does not specify one. The default value for scheme, to be used only if the URL does not specify one. The default value for
this argument is the empty string. this argument is the empty string.
@ -161,7 +161,7 @@ The :mod:`urlparse` module defines the following functions:
equivalent). equivalent).
.. function:: urlsplit(urlstring[, default_scheme[, allow_fragments]]) .. function:: urlsplit(urlstring[, scheme[, allow_fragments]])
This is similar to :func:`urlparse`, but does not split the params from the URL. This is similar to :func:`urlparse`, but does not split the params from the URL.
This should generally be used instead of :func:`urlparse` if the more recent URL This should generally be used instead of :func:`urlparse` if the more recent URL