From fe8e6e741492c496837a48fc04c5c776c8779b32 Mon Sep 17 00:00:00 2001 From: Ezio Melotti Date: Fri, 11 Jan 2013 08:32:01 +0200 Subject: #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. --- Lib/sre_parse.py | 2 +- Lib/test/test_re.py | 6 ++++++ Misc/ACKS | 1 + Misc/NEWS | 3 +++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Lib/sre_parse.py b/Lib/sre_parse.py index 9aea56a..19dd4fc 100644 --- a/Lib/sre_parse.py +++ b/Lib/sre_parse.py @@ -235,7 +235,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 0c8c676..6b047e4 100644 --- a/Lib/test/test_re.py +++ b/Lib/test/test_re.py @@ -857,6 +857,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']) + @bigmemtest(size=_2G, memuse=character_size) def test_large_search(self, size): # Issue #10182: indices were 32-bit-truncated. diff --git a/Misc/ACKS b/Misc/ACKS index cf2296b..d6d81d5 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -65,6 +65,7 @@ Chris Barker Anton Barkovsky Nick Barnes Quentin Barnes +Matthew Barnett Richard Barran Cesar Eduardo Barros Des Barry diff --git a/Misc/NEWS b/Misc/NEWS index f4fb821..91706c1 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -199,6 +199,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 #15545: Fix regression in sqlite3's iterdump method where it was failing if the connection used a row factory (such as sqlite3.Row) that produced unsortable objects. (Regression was introduced by fix for 9750). -- cgit v0.12