diff options
| author | R. David Murray <rdmurray@bitdance.com> | 2010-05-25 15:36:46 (GMT) |
|---|---|---|
| committer | R. David Murray <rdmurray@bitdance.com> | 2010-05-25 15:36:46 (GMT) |
| commit | f5077aa17bc0bcae14524e25cff6635c9398fd57 (patch) | |
| tree | c165a5354eb978f0a21004c0a8070b41e9d74902 | |
| parent | 1d258d76ba27f04cd28068c18a6ee9062aa2a093 (diff) | |
| download | cpython-f5077aa17bc0bcae14524e25cff6635c9398fd57.zip cpython-f5077aa17bc0bcae14524e25cff6635c9398fd57.tar.gz cpython-f5077aa17bc0bcae14524e25cff6635c9398fd57.tar.bz2 | |
Recorded merge of revisions 81521 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r81521 | r.david.murray | 2010-05-25 11:32:06 -0400 (Tue, 25 May 2010) | 2 lines
Issue 8818: urlparse/urlsplit keyword is 'scheme', not 'default_scheme'.
........
| -rw-r--r-- | Doc/library/urllib.parse.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/library/urllib.parse.rst b/Doc/library/urllib.parse.rst index 4900005..53d79e9 100644 --- a/Doc/library/urllib.parse.rst +++ b/Doc/library/urllib.parse.rst @@ -26,7 +26,7 @@ following URL schemes: ``file``, ``ftp``, ``gopher``, ``hdl``, ``http``, The :mod:`urllib.parse` module defines the following functions: -.. function:: urlparse(urlstring, default_scheme='', allow_fragments=True) +.. function:: urlparse(urlstring, scheme='', allow_fragments=True) 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``. @@ -48,7 +48,7 @@ The :mod:`urllib.parse` module defines the following functions: >>> o.geturl() '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 this argument is the empty string. @@ -142,7 +142,7 @@ The :mod:`urllib.parse` module defines the following functions: states that these are equivalent). -.. function:: urlsplit(urlstring, default_scheme='', allow_fragments=True) +.. function:: urlsplit(urlstring, scheme='', allow_fragments=True) 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 |