summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorKen Jin <28750310+Fidget-Spinner@users.noreply.github.com>2021-04-11 13:26:09 (GMT)
committerGitHub <noreply@github.com>2021-04-11 13:26:09 (GMT)
commitb38601d49675d90e1ee6faa47f7adaeca992d02d (patch)
tree3e3cd26efa597a83a06208db51450d10e99f2240 /Lib
parent63bf1abfdc2db2798e477c38f41c486e702b7542 (diff)
downloadcpython-b38601d49675d90e1ee6faa47f7adaeca992d02d.zip
cpython-b38601d49675d90e1ee6faa47f7adaeca992d02d.tar.gz
cpython-b38601d49675d90e1ee6faa47f7adaeca992d02d.tar.bz2
bpo-42967: coerce bytes separator to string in urllib.parse_qs(l) (#24818)
* coerce bytes separator to string * Add news * Update Misc/NEWS.d/next/Library/2021-03-11-00-31-41.bpo-42967.2PeQRw.rst
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_urlparse.py4
-rw-r--r--Lib/urllib/parse.py1
2 files changed, 5 insertions, 0 deletions
diff --git a/Lib/test/test_urlparse.py b/Lib/test/test_urlparse.py
index 3b1c360..c543ac9 100644
--- a/Lib/test/test_urlparse.py
+++ b/Lib/test/test_urlparse.py
@@ -893,6 +893,8 @@ class UrlParseTestCase(unittest.TestCase):
with self.subTest(f"Original: {orig!r}, Expected: {expect!r}"):
result = urllib.parse.parse_qs(orig, separator=';')
self.assertEqual(result, expect, "Error parsing %r" % orig)
+ result_bytes = urllib.parse.parse_qs(orig, separator=b';')
+ self.assertEqual(result_bytes, expect, "Error parsing %r" % orig)
def test_parse_qsl_separator(self):
@@ -912,6 +914,8 @@ class UrlParseTestCase(unittest.TestCase):
with self.subTest(f"Original: {orig!r}, Expected: {expect!r}"):
result = urllib.parse.parse_qsl(orig, separator=';')
self.assertEqual(result, expect, "Error parsing %r" % orig)
+ result_bytes = urllib.parse.parse_qsl(orig, separator=b';')
+ self.assertEqual(result_bytes, expect, "Error parsing %r" % orig)
def test_urlencode_sequences(self):
diff --git a/Lib/urllib/parse.py b/Lib/urllib/parse.py
index 335e183..21cae47 100644
--- a/Lib/urllib/parse.py
+++ b/Lib/urllib/parse.py
@@ -733,6 +733,7 @@ def parse_qsl(qs, keep_blank_values=False, strict_parsing=False,
Returns a list, as G-d intended.
"""
qs, _coerce_result = _coerce_args(qs)
+ separator, _ = _coerce_args(separator)
if not separator or (not isinstance(separator, (str, bytes))):
raise ValueError("Separator must be of type string or bytes.")