#14179: merge with 3.2.

ezio-melotti · ezio-melotti · commit cc50ba26bd18 · 2012-03-13T01:33:30.000+02:00
diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py
@@ -825,6 +825,16 @@ def test_search_dot_unicode(self):
         self.assertIsNotNone(re.search("123.*-", '123\U0010ffff-'))
         self.assertIsNotNone(re.search("123.*-", '123\xe9\u20ac\U0010ffff-'))
 
+    def test_compile(self):
+        # Test return value when given string and pattern as parameter
+        pattern = re.compile('random pattern')
+        self.assertIsInstance(pattern, re._pattern_type)
+        same_pattern = re.compile(pattern)
+        self.assertIsInstance(same_pattern, re._pattern_type)
+        self.assertIs(same_pattern, pattern)
+        # Test behaviour when not given a string or pattern as parameter
+        self.assertRaises(TypeError, re.compile, 0)
+
 def run_re_tests():
     from test.re_tests import tests, SUCCEED, FAIL, SYNTAX_ERROR
     if verbose:
diff --git a/Misc/ACKS b/Misc/ACKS
@@ -687,6 +687,7 @@ Andrii V. Mishkovskyi
 Dom Mitchell
 Dustin J. Mitchell
 Zubin Mithra
+Florian Mladitsch
 Doug Moen
 The Dragon De Monsyne
 Skip Montanaro
