[Python-checkins] cpython (merge 3.3 -> default): Issue #2537: Remove breaked check which prevented valid regular expressions.

[serhiy.storchaka]

http://hg.python.org/cpython/rev/f4271cc2dfb5
changeset:   85275:f4271cc2dfb5
parent:      85272:8b24818c7327
parent:      85274:7ab07f15d78c
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Mon Aug 19 23:19:49 2013 +0300
summary:
  Issue #2537: Remove breaked check which prevented valid regular expressions.
Patch by Meador Inge.

See also issue #18647.

files:
  Lib/sre_compile.py  |   2 --
  Lib/test/test_re.py |  10 ++++++++++
  2 files changed, 10 insertions(+), 2 deletions(-)


diff --git a/Lib/sre_compile.py b/Lib/sre_compile.py
--- a/Lib/sre_compile.py
+++ b/Lib/sre_compile.py
@@ -351,8 +351,6 @@
 def _simple(av):
     # check if av is a "simple" operator
     lo, hi = av[2].getwidth()
-    #if lo == 0 and hi == MAXREPEAT:
-    #    raise error("nothing to repeat")
     return lo == hi == 1 and av[2][0][0] != SUBPATTERN
 
 def _compile_info(code, pattern, flags):
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
@@ -1051,6 +1051,16 @@
                                  [b'xyz'], msg=pattern)
 
 
+    def test_bug_2537(self):
+        # issue 2537: empty submatches
+        for outer_op in ('{0,}', '*', '+', '{1,187}'):
+            for inner_op in ('{0,}', '*', '?'):
+                r = re.compile("^((x|y)%s)%s" % (inner_op, outer_op))
+                m = r.match("xyyzy")
+                self.assertEqual(m.group(0), "xyy")
+                self.assertEqual(m.group(1), "")
+                self.assertEqual(m.group(2), "y")
+
 def run_re_tests():
     from test.re_tests import tests, SUCCEED, FAIL, SYNTAX_ERROR
     if verbose:

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