From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Fri, 11 Jan 2013 06:43:53 +0000 (+0200)
Subject: #13899: merge with 3.2.
X-Git-Tag: v3.3.1rc1~387
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=adfbb8e8ec7c7db027d403a443ca9c00347b987a;p=thirdparty%2FPython%2Fcpython.git

#13899: merge with 3.2.
---

adfbb8e8ec7c7db027d403a443ca9c00347b987a
diff --cc Lib/test/test_re.py
index b945203633df,6b047e48dbb7..feae7c55075c
--- a/Lib/test/test_re.py
+++ b/Lib/test/test_re.py
@@@ -949,7 -857,13 +949,13 @@@ 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)
 +    @bigmemtest(size=_2G, memuse=1)
      def test_large_search(self, size):
          # Issue #10182: indices were 32-bit-truncated.
          s = 'a' * size
diff --cc Misc/NEWS
index 1d12d263d039,91706c1e6b6d..1633879cd3c7
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -142,8 -199,9 +142,11 @@@ Core and Builtin
  Library
  -------
  
 +- 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).