diff options
| -rw-r--r-- | Lib/sre_parse.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_re.py | 6 | ||||
| -rw-r--r-- | Misc/ACKS | 1 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
4 files changed, 11 insertions, 1 deletions
diff --git a/Lib/sre_parse.py b/Lib/sre_parse.py index 7149dca491..8b98b1ac2e 100644 --- a/Lib/sre_parse.py +++ b/Lib/sre_parse.py @@ -228,7 +228,7 @@ def _class_escape(source, escape): if code: return code code = CATEGORIES.get(escape) - if code: + if code and code[0] == IN: return code try: c = escape[1:2] diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py index 70702e6348..dee5efee8e 100644 --- a/Lib/test/test_re.py +++ b/Lib/test/test_re.py @@ -821,6 +821,12 @@ class ReTests(unittest.TestCase): # Test behaviour when not given a string or pattern as parameter self.assertRaises(TypeError, re.compile, 0) + def test_bug_13899(self): + # Issue #13899: re pattern r"[\A]" should work like "A" but matches + # nothing. Ditto B and Z. + self.assertEqual(re.findall(r'[\A\B\b\C\Z]', 'AB\bCZ'), + ['A', 'B', '\b', 'C', 'Z']) + @precisionbigmemtest(size=_2G, memuse=1) def test_large_search(self, size): # Issue #10182: indices were 32-bit-truncated. @@ -58,6 +58,7 @@ Chris Barker Anton Barkovsky Nick Barnes Quentin Barnes +Matthew Barnett Richard Barran Cesar Eduardo Barros Des Barry @@ -186,6 +186,9 @@ Core and Builtins Library ------- +- Issue #13899: \A, \Z, and \B now correctly match the A, Z, and B literals + when used inside character classes (e.g. '[\A]'). Patch by Matthew Barnett. + - Issue #15109: Fix regression in sqlite3's iterdump method where it would die with an encoding error if the database contained string values containing non-ASCII. (Regression was introduced by fix for 9750). |