summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorAnish Shah <anish.shah>2016-02-07 00:36:00 (GMT)
committerAnish Shah <anish.shah>2016-02-07 00:36:00 (GMT)
commit102d813b5553c8f0b1d0653bb9f9b7a3ac9a56c8 (patch)
tree30a5050701426b83c91242e917b7b897093b898e /Lib
parente14c07e4e469a91d74546db9980699b4fbed03db (diff)
downloadcpython-102d813b5553c8f0b1d0653bb9f9b7a3ac9a56c8.zip
cpython-102d813b5553c8f0b1d0653bb9f9b7a3ac9a56c8.tar.gz
cpython-102d813b5553c8f0b1d0653bb9f9b7a3ac9a56c8.tar.bz2
Issue #26302: Correctly identify comma as an invalid character for a cookie (correcting regression in Python 3.5).
Diffstat (limited to 'Lib')
-rw-r--r--Lib/http/cookies.py2
-rw-r--r--Lib/test/test_http_cookies.py6
2 files changed, 7 insertions, 1 deletions
diff --git a/Lib/http/cookies.py b/Lib/http/cookies.py
index fda02b7..dbddd6c 100644
--- a/Lib/http/cookies.py
+++ b/Lib/http/cookies.py
@@ -174,7 +174,7 @@ _Translator.update({
ord('\\'): '\\\\',
})
-_is_legal_key = re.compile('[%s]+' % _LegalChars).fullmatch
+_is_legal_key = re.compile('[%s]+' % re.escape(_LegalChars)).fullmatch
def _quote(str):
r"""Quote a string for use in a cookie header.
diff --git a/Lib/test/test_http_cookies.py b/Lib/test/test_http_cookies.py
index d3e06a4..2432e0b 100644
--- a/Lib/test/test_http_cookies.py
+++ b/Lib/test/test_http_cookies.py
@@ -210,6 +210,12 @@ class CookieTests(unittest.TestCase):
C1 = pickle.loads(pickle.dumps(C, protocol=proto))
self.assertEqual(C1.output(), expected_output)
+ def test_illegal_chars(self):
+ rawdata = "a=b; c,d=e"
+ C = cookies.SimpleCookie()
+ with self.assertRaises(cookies.CookieError):
+ C.load(rawdata)
+
class MorselTests(unittest.TestCase):
"""Tests for the Morsel object."""