summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Panter <vadmium>2015-09-20 01:07:41 +0000
committerMartin Panter <vadmium>2015-09-20 01:07:41 +0000
commit926be1b0ecabc1343f94cff44bd8b0d848213fdb (patch)
tree2094bb6cbe0a9f02910e461c29af5674f7e8b8f6
parent5783fd2c58d068329c1ddeaea1db8acca5e2577b (diff)
parentcebfdac32c0c20c196da87e7ce2dc1894d6d1b04 (diff)
downloadcpython-git-926be1b0ecabc1343f94cff44bd8b0d848213fdb.tar.gz
Issue #25176: Merge cgi.parse_qsl link from 3.4 into 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 0a9e884280..7e496ca361 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 ba144b7032..d5a0563e19 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1334,6 +1334,7 @@ Ng Pheng Siong
George Sipe
J. Sipprell
Kragen Sitaker
+Ville Skyttä
Michael Sloan
Nick Sloan
Václav Šmilauer