From 3e13bd6630106bc3e5c7111d1a2486d5dd29ba51 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Tue, 3 Nov 2009 18:35:03 +0000 Subject: [PATCH] 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. ........ --- Doc/library/urlparse.rst | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Doc/library/urlparse.rst b/Doc/library/urlparse.rst index 40f889b47d9..e238ff0ae96 100644 --- a/Doc/library/urlparse.rst +++ b/Doc/library/urlparse.rst @@ -121,6 +121,9 @@ The :mod:`urlparse` module defines the following functions: 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 @@ The :mod:`urlparse` module defines the following functions: 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