Merged revisions 76095 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r76095 | georg.brandl | 2009-11-03 18:34:27 +0000 (Di, 03 Nov 2009) | 1 line
#7256: add versionadded tags for functions copied from cgi.
........
diff --git a/Doc/library/urlparse.rst b/Doc/library/urlparse.rst
index 40f889b..e238ff0 100644
--- a/Doc/library/urlparse.rst
+++ b/Doc/library/urlparse.rst
@@ -121,6 +121,9 @@
Use the :func:`urllib.urlencode` function to convert such dictionaries into
query strings.
+ .. versionadded:: 2.6
+ Copied from the :mod:`cgi` module.
+
.. function:: parse_qsl(qs[, keep_blank_values[, strict_parsing]])
@@ -141,6 +144,10 @@
Use the :func:`urllib.urlencode` function to convert such lists of pairs into
query strings.
+ .. versionadded:: 2.6
+ Copied from the :mod:`cgi` module.
+
+
.. function:: urlunparse(parts)
Construct a URL from a tuple as returned by ``urlparse()``. The *parts* argument