[Python-checkins] cpython (merge 3.5 -> default): Issue #25176: Merge cgi.parse_qsl link from 3.5

Sun Sep 20 03:19:32 CEST 2015

https://hg.python.org/cpython/rev/f08d56387982
changeset: 98077:f08d56387982
parent: 98074:37d3b95a289b
parent: 98076:138bbb7cf612
user: Martin Panter <vadmium>
date: Sun Sep 20 01:11:50 2015 +0000
summary:
 Issue #25176: Merge cgi.parse_qsl link from 3.5
files:
 Doc/library/cgi.rst | 2 +-
 Misc/ACKS | 1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/Doc/library/cgi.rst b/Doc/library/cgi.rst
--- a/Doc/library/cgi.rst
+++ b/Doc/library/cgi.rst
@@ -292,7 +292,7 @@
 
 .. function:: parse_qsl(qs, keep_blank_values=False, strict_parsing=False)
 
- This function is deprecated in this module. Use :func:`urllib.parse.parse_qs`
+ This function is deprecated in this module. Use :func:`urllib.parse.parse_qsl`
 instead. It is maintained here only for backward compatibility.
 
 .. function:: parse_multipart(fp, pdict)
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1335,6 +1335,7 @@
 George Sipe
 J. Sipprell
 Kragen Sitaker
+Ville Skyttä
 Michael Sloan
 Nick Sloan
 Václav Šmilauer
-- 
Repository URL: https://hg.python.org/cpython
