summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Panter <vadmium>2015-09-20 01:11:50 (GMT)
committerMartin Panter <vadmium>2015-09-20 01:11:50 (GMT)
commitb7d276e6478b441357def7e3e3b5f814d7554bc3 (patch)
tree606cc24673f807a8f5eb91715d5b58cdf5653421
parentedef3ebafa3238b97d3bfe9913a904f19a1c195e (diff)
parent926be1b0ecabc1343f94cff44bd8b0d848213fdb (diff)
downloadcpython-b7d276e6478b441357def7e3e3b5f814d7554bc3.zip
cpython-b7d276e6478b441357def7e3e3b5f814d7554bc3.tar.gz
cpython-b7d276e6478b441357def7e3e3b5f814d7554bc3.tar.bz2
Issue #25176: Merge cgi.parse_qsl link from 3.5
-rw-r--r--Doc/library/cgi.rst2
-rw-r--r--Misc/ACKS1
2 files changed, 2 insertions, 1 deletions
diff --git a/Doc/library/cgi.rst b/Doc/library/cgi.rst
index 0a9e884..7e496ca 100644
--- a/Doc/library/cgi.rst
+++ b/Doc/library/cgi.rst
@@ -292,7 +292,7 @@ algorithms implemented in this module in other circumstances.
.. 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
index bc375d4..376c3c5 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1335,6 +1335,7 @@ Ng Pheng Siong
George Sipe
J. Sipprell
Kragen Sitaker
+Ville Skyttä
Michael Sloan
Nick Sloan
Václav Šmilauer