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