From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Mon, 12 Mar 2012 23:33:30 +0000 (+0200)
Subject: #14179: merge with 3.2.
X-Git-Tag: v3.3.0a2~234^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cc50ba26bd186dd2f7e093be9f7b7bb18d08a35a;p=python

#14179: merge with 3.2.
---

cc50ba26bd186dd2f7e093be9f7b7bb18d08a35a
diff --cc Lib/test/test_re.py
index 34c4a5f58b,940ba39058..425c0eb167
--- a/Lib/test/test_re.py
+++ b/Lib/test/test_re.py
@@@ -818,13 -818,16 +818,23 @@@ class ReTests(unittest.TestCase)
          self.assertRaises(OverflowError, _sre.compile, "abc", 0, [long_overflow])
          self.assertRaises(TypeError, _sre.compile, {}, 0, [])
  
 +    def test_search_dot_unicode(self):
 +        self.assertIsNotNone(re.search("123.*-", '123abc-'))
 +        self.assertIsNotNone(re.search("123.*-", '123\xe9-'))
 +        self.assertIsNotNone(re.search("123.*-", '123\u20ac-'))
 +        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 --cc Misc/ACKS
index 061df39a39,a7d89d39c4..48bdde4cdb
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@@ -682,11 -626,10 +682,12 @@@ Damien Mille
  Jason V. Miller
  Jay T. Miller
  Roman Milner
 +Julien Miotte
  Andrii V. Mishkovskyi
 -Dustin J. Mitchell
  Dom Mitchell
 +Dustin J. Mitchell
 +Zubin Mithra
+ Florian Mladitsch
  Doug Moen
  The Dragon De Monsyne
  Skip Montanaro