diff -r 961145c548e2 Doc/library/re.rst --- a/Doc/library/re.rst Sun Nov 30 11:51:48 2014 -0500 +++ b/Doc/library/re.rst Sun Nov 30 21:32:26 2014 +0200 @@ -276,7 +276,9 @@ The special characters are: assertion`. ``(?<=abc)def`` will find a match in ``abcdef``, since the lookbehind will back up 3 characters and check if the contained pattern matches. The contained pattern must only match strings of some fixed length, meaning that - ``abc`` or ``a|b`` are allowed, but ``a*`` and ``a{3,4}`` are not. Note that + ``abc`` or ``a|b`` are allowed, but ``a*`` and ``a{3,4}`` are not. Group + references are not supported even if they match strings of some fixed length. + Note that patterns which start with positive lookbehind assertions will not match at the beginning of the string being searched; you will most likely want to use the :func:`search` function rather than the :func:`match` function: @@ -296,7 +298,8 @@ The special characters are: Matches if the current position in the string is not preceded by a match for ``...``. This is called a :dfn:`negative lookbehind assertion`. Similar to positive lookbehind assertions, the contained pattern must only match strings of - some fixed length. Patterns which start with negative lookbehind assertions may + some fixed length and shouldn't contain group references. + Patterns which start with negative lookbehind assertions may match at the beginning of the string being searched. ``(?(id/name)yes-pattern|no-pattern)`` diff -r 961145c548e2 Lib/sre_parse.py --- a/Lib/sre_parse.py Sun Nov 30 11:51:48 2014 -0500 +++ b/Lib/sre_parse.py Sun Nov 30 21:32:26 2014 +0200 @@ -69,6 +69,8 @@ class Pattern: self.open = [] self.groups = 1 self.groupdict = {} + self.lookbehind = 0 + def opengroup(self, name=None): gid = self.groups self.groups = gid + 1 @@ -299,6 +301,9 @@ def _escape(source, escape, state): if group < state.groups: if not state.checkgroup(group): raise error, "cannot refer to open group" + if state.lookbehind: + raise error('group references in lookbehind ' + 'assertions are not supported') return GROUPREF, group raise ValueError if len(escape) == 2: @@ -578,6 +583,9 @@ def _parse(source, state): if gid is None: msg = "unknown group name: {0!r}".format(name) raise error(msg) + if state.lookbehind: + raise error('group references in lookbehind ' + 'assertions are not supported') subpatternappend((GROUPREF, gid)) continue else: @@ -606,7 +614,10 @@ def _parse(source, state): raise error, "syntax error" dir = -1 # lookbehind char = sourceget() + state.lookbehind += 1 p = _parse_sub(source, state) + if dir < 0: + state.lookbehind -= 1 if not sourcematch(")"): raise error, "unbalanced parenthesis" if char == "=": @@ -637,6 +648,9 @@ def _parse(source, state): condgroup = int(condname) except ValueError: raise error, "bad character in group name" + if state.lookbehind: + raise error('group references in lookbehind ' + 'assertions are not supported') else: # flags if not source.next in FLAGS: diff -r 961145c548e2 Lib/test/test_re.py --- a/Lib/test/test_re.py Sun Nov 30 11:51:48 2014 -0500 +++ b/Lib/test/test_re.py Sun Nov 30 21:32:26 2014 +0200 @@ -449,7 +449,7 @@ class ReTests(unittest.TestCase): self.assertEqual(re.match("a.*b", "a\n\nb", re.DOTALL).group(0), "a\n\nb") - def test_non_consuming(self): + def test_lookahead(self): self.assertEqual(re.match("(a(?=\s[^a]))", "a b").group(1), "a") self.assertEqual(re.match("(a(?=\s[^a]*))", "a b").group(1), "a") self.assertEqual(re.match("(a(?=\s[abc]))", "a b").group(1), "a") @@ -463,6 +463,37 @@ class ReTests(unittest.TestCase): self.assertEqual(re.match(r"(a)(?!\s\1)", "a b").group(1), "a") self.assertEqual(re.match(r"(a)(?!\s(abc|a))", "a b").group(1), "a") + # Group reference. + self.assertTrue(re.match(r'(a)b(?=\1)a', 'aba')) + self.assertIsNone(re.match(r'(a)b(?=\1)c', 'abac')) + # Named group reference. + self.assertTrue(re.match(r'(?Pa)b(?=(?P=g))a', 'aba')) + self.assertIsNone(re.match(r'(?Pa)b(?=(?P=g))c', 'abac')) + # Conditional group reference. + self.assertTrue(re.match('(?:(a)|(x))b(?=(?(2)x|c))c', 'abc')) + self.assertIsNone(re.match('(?:(a)|(x))b(?=(?(2)c|x))c', 'abc')) + self.assertTrue(re.match('(?:(a)|(x))b(?=(?(2)x|c))c', 'abc')) + self.assertIsNone(re.match('(?:(a)|(x))b(?=(?(1)b|x))c', 'abc')) + self.assertTrue(re.match('(?:(a)|(x))b(?=(?(1)c|x))c', 'abc')) + # Group used before defined. + self.assertTrue(re.match('(a)b(?=(?(2)x|c))(c)', 'abc')) + self.assertIsNone(re.match('(a)b(?=(?(2)b|x))(c)', 'abc')) + self.assertTrue(re.match('(a)b(?=(?(1)c|x))(c)', 'abc')) + + def test_lookbehind(self): + self.assertTrue(re.match('ab(?<=b)c', 'abc')) + self.assertIsNone(re.match('ab(?<=c)c', 'abc')) + self.assertIsNone(re.match('ab(?a)a(?<=(?P=g))c') + # Conditional group reference. + self.assertRaises(re.error, re.compile, '(a)b(?<=(?(1)b|x))c') + # Group used before defined. + self.assertRaises(re.error, re.compile, '(a)b(?<=(?(2)b|x))(c)') + def test_ignore_case(self): self.assertEqual(re.match("abc", "ABC", re.I).group(0), "ABC") self.assertEqual(re.match("abc", u"ABC", re.I).group(0), "ABC") diff -r 961145c548e2 Misc/NEWS --- a/Misc/NEWS Sun Nov 30 11:51:48 2014 -0500 +++ b/Misc/NEWS Sun Nov 30 21:32:26 2014 +0200 @@ -13,6 +13,9 @@ Core and Builtins Library ------- +- Issues #814253, #9179: Group references and conditional group references now + explicitly forbidden in lookbehind assertions in regular expressions. + - Issue #22609: Constructors and update methods of mapping classes in the collections module now accept the self keyword argument.