https://github.com/python/cpython/commit/7577307ebdaeef6702b639e22a896080e81aae4e
commit: 7577307ebdaeef6702b639e22a896080e81aae4e
branch: main
author: Serhiy Storchaka <[email protected]>
committer: serhiy-storchaka <[email protected]>
date: 2024-11-12T21:10:29+02:00
summary:
gh-116897: Deprecate generic false values in urllib.parse.parse_qsl()
(GH-116903)
Accepting objects with false values (like 0 and []) except empty strings
and byte-like objects and None in urllib.parse functions parse_qsl() and
parse_qs() is now deprecated.
files:
A Misc/NEWS.d/next/Library/2024-03-16-13-38-27.gh-issue-116897.UDQTjp.rst
M Doc/library/urllib.parse.rst
M Doc/whatsnew/3.14.rst
M Lib/test/test_urlparse.py
M Lib/urllib/parse.py
diff --git a/Doc/library/urllib.parse.rst b/Doc/library/urllib.parse.rst
index fb5353e1895bf9..0501dc8733b2cd 100644
--- a/Doc/library/urllib.parse.rst
+++ b/Doc/library/urllib.parse.rst
@@ -239,6 +239,10 @@ or on combining URL components into a URL string.
query parameter separator. This has been changed to allow only a single
separator key, with ``&`` as the default separator.
+ .. deprecated:: 3.14
+ Accepting objects with false values (like ``0`` and ``[]``) except empty
+ strings and byte-like objects and ``None`` is now deprecated.
+
.. function:: parse_qsl(qs, keep_blank_values=False, strict_parsing=False,
encoding='utf-8', errors='replace', max_num_fields=None, separator='&')
@@ -745,6 +749,10 @@ task isn't already covered by the URL parsing functions
above.
.. versionchanged:: 3.5
Added the *quote_via* parameter.
+ .. deprecated:: 3.14
+ Accepting objects with false values (like ``0`` and ``[]``) except empty
+ strings and byte-like objects and ``None`` is now deprecated.
+
.. seealso::
diff --git a/Doc/whatsnew/3.14.rst b/Doc/whatsnew/3.14.rst
index c2cf46902fd7fe..a98fe3f468b685 100644
--- a/Doc/whatsnew/3.14.rst
+++ b/Doc/whatsnew/3.14.rst
@@ -583,6 +583,13 @@ Deprecated
Deprecate :meth:`symtable.Class.get_methods` due to the lack of interest.
(Contributed by Bénédikt Tran in :gh:`119698`.)
+* :mod:`urllib.parse`:
+ Accepting objects with false values (like ``0`` and ``[]``) except empty
+ strings, byte-like objects and ``None`` in :mod:`urllib.parse` functions
+ :func:`~urllib.parse.parse_qsl` and :func:`~urllib.parse.parse_qs` is now
+ deprecated.
+ (Contributed by Serhiy Storchaka in :gh:`116897`.)
+
.. Add deprecations above alphabetically, not here at the end.
.. include:: ../deprecations/pending-removal-in-3.15.rst
diff --git a/Lib/test/test_urlparse.py b/Lib/test/test_urlparse.py
index 297fb4831c16bf..4516bdea6adb19 100644
--- a/Lib/test/test_urlparse.py
+++ b/Lib/test/test_urlparse.py
@@ -1314,9 +1314,17 @@ def test_parse_qsl_bytes(self):
def test_parse_qsl_false_value(self):
kwargs = dict(keep_blank_values=True, strict_parsing=True)
- for x in '', b'', None, 0, 0.0, [], {}, memoryview(b''):
+ for x in '', b'', None, memoryview(b''):
self.assertEqual(urllib.parse.parse_qsl(x, **kwargs), [])
self.assertRaises(ValueError, urllib.parse.parse_qsl, x,
separator=1)
+ for x in 0, 0.0, [], {}:
+ with self.assertWarns(DeprecationWarning) as cm:
+ self.assertEqual(urllib.parse.parse_qsl(x, **kwargs), [])
+ self.assertEqual(cm.filename, __file__)
+ with self.assertWarns(DeprecationWarning) as cm:
+ self.assertEqual(urllib.parse.parse_qs(x, **kwargs), {})
+ self.assertEqual(cm.filename, __file__)
+ self.assertRaises(ValueError, urllib.parse.parse_qsl, x,
separator=1)
def test_parse_qsl_errors(self):
self.assertRaises(TypeError, urllib.parse.parse_qsl, list(b'a=b'))
diff --git a/Lib/urllib/parse.py b/Lib/urllib/parse.py
index a721d777c82f82..8d7631d5693ece 100644
--- a/Lib/urllib/parse.py
+++ b/Lib/urllib/parse.py
@@ -753,7 +753,8 @@ def parse_qs(qs, keep_blank_values=False,
strict_parsing=False,
parsed_result = {}
pairs = parse_qsl(qs, keep_blank_values, strict_parsing,
encoding=encoding, errors=errors,
- max_num_fields=max_num_fields, separator=separator)
+ max_num_fields=max_num_fields, separator=separator,
+ _stacklevel=2)
for name, value in pairs:
if name in parsed_result:
parsed_result[name].append(value)
@@ -763,7 +764,7 @@ def parse_qs(qs, keep_blank_values=False,
strict_parsing=False,
def parse_qsl(qs, keep_blank_values=False, strict_parsing=False,
- encoding='utf-8', errors='replace', max_num_fields=None,
separator='&'):
+ encoding='utf-8', errors='replace', max_num_fields=None,
separator='&', *, _stacklevel=1):
"""Parse a query given as a string argument.
Arguments:
@@ -791,7 +792,6 @@ def parse_qsl(qs, keep_blank_values=False,
strict_parsing=False,
Returns a list, as G-d intended.
"""
-
if not separator or not isinstance(separator, (str, bytes)):
raise ValueError("Separator must be of type string or bytes.")
if isinstance(qs, str):
@@ -800,12 +800,21 @@ def parse_qsl(qs, keep_blank_values=False,
strict_parsing=False,
eq = '='
def _unquote(s):
return unquote_plus(s, encoding=encoding, errors=errors)
+ elif qs is None:
+ return []
else:
- if not qs:
- return []
- # Use memoryview() to reject integers and iterables,
- # acceptable by the bytes constructor.
- qs = bytes(memoryview(qs))
+ try:
+ # Use memoryview() to reject integers and iterables,
+ # acceptable by the bytes constructor.
+ qs = bytes(memoryview(qs))
+ except TypeError:
+ if not qs:
+ warnings.warn(f"Accepting {type(qs).__name__} objects with "
+ f"false value in urllib.parse.parse_qsl() is "
+ f"deprecated as of 3.14",
+ DeprecationWarning, stacklevel=_stacklevel + 1)
+ return []
+ raise
if isinstance(separator, str):
separator = bytes(separator, 'ascii')
eq = b'='
diff --git
a/Misc/NEWS.d/next/Library/2024-03-16-13-38-27.gh-issue-116897.UDQTjp.rst
b/Misc/NEWS.d/next/Library/2024-03-16-13-38-27.gh-issue-116897.UDQTjp.rst
new file mode 100644
index 00000000000000..6c8e4b16f20de8
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2024-03-16-13-38-27.gh-issue-116897.UDQTjp.rst
@@ -0,0 +1,4 @@
+Accepting objects with false values (like ``0`` and ``[]``) except empty
+strings, byte-like objects and ``None`` in :mod:`urllib.parse` functions
+:func:`~urllib.parse.parse_qsl` and :func:`~urllib.parse.parse_qs` is now
+deprecated.
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
