From 6ed5f30f94b262c6ba266188fb934aaf4359abe7 Mon Sep 17 00:00:00 2001 From: "Andrew M. Kuchling" Date: Thu, 2 Jun 2005 13:40:12 +0000 Subject: [PATCH] [Bug #1177831] Fix (?(id)yes|no) for a group other than the first one, and add a test case --- Lib/sre_compile.py | 2 +- Lib/test/test_re.py | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Lib/sre_compile.py b/Lib/sre_compile.py index 27ab1fe7482a..af06d881a898 100644 --- a/Lib/sre_compile.py +++ b/Lib/sre_compile.py @@ -156,7 +156,7 @@ def _compile(code, pattern, flags): emit(av-1) elif op is GROUPREF_EXISTS: emit(OPCODES[op]) - emit((av[0]-1)*2) + emit(av[0]-1) skipyes = _len(code); emit(0) _compile(code, av[1], flags) if av[2]: diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py index 07bc63b277a7..c86f502c50d4 100644 --- a/Lib/test/test_re.py +++ b/Lib/test/test_re.py @@ -235,6 +235,16 @@ class ReTests(unittest.TestCase): self.assertEqual(re.match('^(?:(a)|c)((?(1)|d))$', 'a').groups(), ('a', '')) + # Tests for bug #1177831: exercise groups other than the first group + p = re.compile('(?Pa)(?Pb)?((?(g2)c|d))') + self.assertEqual(p.match('abc').groups(), + ('a', 'b', 'c')) + self.assertEqual(p.match('ad').groups(), + ('a', None, 'd')) + self.assertEqual(p.match('abd'), None) + self.assertEqual(p.match('ac'), None) + + def test_re_groupref(self): self.assertEqual(re.match(r'^(\|)?([^()]+)\1$', '|a|').groups(), ('|', 'a')) -- 2.47.3