[Python-checkins] cpython (merge 3.3 -> default): #13899: merge with 3.3.

[ezio.melotti]

http://hg.python.org/cpython/rev/35ece2465936
changeset:   81390:35ece2465936
parent:      81386:680a855ec91e
parent:      81389:17b1eb4a8144
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Jan 11 08:44:25 2013 +0200
summary:
  #13899: merge with 3.3.

files:
  Lib/sre_parse.py    |  2 +-
  Lib/test/test_re.py |  6 ++++++
  Misc/NEWS           |  3 +++
  3 files changed, 10 insertions(+), 1 deletions(-)


diff --git a/Lib/sre_parse.py b/Lib/sre_parse.py
--- a/Lib/sre_parse.py
+++ b/Lib/sre_parse.py
@@ -245,7 +245,7 @@
     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
--- a/Lib/test/test_re.py
+++ b/Lib/test/test_re.py
@@ -949,6 +949,12 @@
         # 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=1)
     def test_large_search(self, size):
         # Issue #10182: indices were 32-bit-truncated.
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -214,6 +214,9 @@
 
 - Issue #16900: Issue a ResourceWarning when an ssl socket is left unclosed.
 
+- 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).

-- 
Repository URL: http://hg.python.org/cpython