summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2015-02-21 10:08:36 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2015-02-21 10:08:36 (GMT)
commit4809d1fccd81bd3e1e4b08152545cfd88b69231c (patch)
treef3e5022ed49fbf2b5c4fd972b62572fcf5b06690
parent021d55ff745268299f8c3d487aac7f12a01ec294 (diff)
downloadcpython-4809d1fccd81bd3e1e4b08152545cfd88b69231c.zip
cpython-4809d1fccd81bd3e1e4b08152545cfd88b69231c.tar.gz
cpython-4809d1fccd81bd3e1e4b08152545cfd88b69231c.tar.bz2
Issues #814253, #9179: Warnings now are raised when group references and
conditional group references are used in lookbehind assertions in regular expressions.
-rw-r--r--Doc/library/re.rst7
-rw-r--r--Lib/sre_parse.py20
-rw-r--r--Lib/test/test_re.py45
-rw-r--r--Misc/NEWS4
4 files changed, 70 insertions, 6 deletions
diff --git a/Doc/library/re.rst b/Doc/library/re.rst
index db7e1cf..b353c4c 100644
--- a/Doc/library/re.rst
+++ b/Doc/library/re.rst
@@ -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 --git a/Lib/sre_parse.py b/Lib/sre_parse.py
index b85ce88..c29cc16 100644
--- a/Lib/sre_parse.py
+++ b/Lib/sre_parse.py
@@ -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,11 @@ def _escape(source, escape, state):
if group < state.groups:
if not state.checkgroup(group):
raise error, "cannot refer to open group"
+ if state.lookbehind:
+ import warnings
+ warnings.warn('group references in lookbehind '
+ 'assertions are not supported',
+ RuntimeWarning)
return GROUPREF, group
raise ValueError
if len(escape) == 2:
@@ -578,6 +585,11 @@ def _parse(source, state):
if gid is None:
msg = "unknown group name: {0!r}".format(name)
raise error(msg)
+ if state.lookbehind:
+ import warnings
+ warnings.warn('group references in lookbehind '
+ 'assertions are not supported',
+ RuntimeWarning)
subpatternappend((GROUPREF, gid))
continue
else:
@@ -606,7 +618,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 +652,11 @@ def _parse(source, state):
condgroup = int(condname)
except ValueError:
raise error, "bad character in group name"
+ if state.lookbehind:
+ import warnings
+ warnings.warn('group references in lookbehind '
+ 'assertions are not supported',
+ RuntimeWarning)
else:
# flags
if not source.next in FLAGS:
diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py
index 5e2914d..588042a 100644
--- a/Lib/test/test_re.py
+++ b/Lib/test/test_re.py
@@ -1,7 +1,9 @@
# -*- coding: utf-8 -*-
-from test.test_support import verbose, run_unittest, import_module
-from test.test_support import precisionbigmemtest, _2G, cpython_only
-from test.test_support import captured_stdout, have_unicode, requires_unicode, u
+from test.test_support import (
+ verbose, run_unittest, import_module,
+ precisionbigmemtest, _2G, cpython_only,
+ captured_stdout, have_unicode, requires_unicode, u,
+ check_warnings)
import locale
import re
from re import Scanner
@@ -449,7 +451,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 +465,41 @@ 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'(?P<g>a)b(?=(?P=g))a', 'aba'))
+ self.assertIsNone(re.match(r'(?P<g>a)b(?=(?P=g))c', 'abac'))
+ # Conditional group reference.
+ self.assertTrue(re.match(r'(?:(a)|(x))b(?=(?(2)x|c))c', 'abc'))
+ self.assertIsNone(re.match(r'(?:(a)|(x))b(?=(?(2)c|x))c', 'abc'))
+ self.assertTrue(re.match(r'(?:(a)|(x))b(?=(?(2)x|c))c', 'abc'))
+ self.assertIsNone(re.match(r'(?:(a)|(x))b(?=(?(1)b|x))c', 'abc'))
+ self.assertTrue(re.match(r'(?:(a)|(x))b(?=(?(1)c|x))c', 'abc'))
+ # Group used before defined.
+ self.assertTrue(re.match(r'(a)b(?=(?(2)x|c))(c)', 'abc'))
+ self.assertIsNone(re.match(r'(a)b(?=(?(2)b|x))(c)', 'abc'))
+ self.assertTrue(re.match(r'(a)b(?=(?(1)c|x))(c)', 'abc'))
+
+ def test_lookbehind(self):
+ self.assertTrue(re.match(r'ab(?<=b)c', 'abc'))
+ self.assertIsNone(re.match(r'ab(?<=c)c', 'abc'))
+ self.assertIsNone(re.match(r'ab(?<!b)c', 'abc'))
+ self.assertTrue(re.match(r'ab(?<!c)c', 'abc'))
+ # Group reference.
+ with check_warnings(('', RuntimeWarning)):
+ re.compile(r'(a)a(?<=\1)c')
+ # Named group reference.
+ with check_warnings(('', RuntimeWarning)):
+ re.compile(r'(?P<g>a)a(?<=(?P=g))c')
+ # Conditional group reference.
+ with check_warnings(('', RuntimeWarning)):
+ re.compile(r'(a)b(?<=(?(1)b|x))c')
+ # Group used before defined.
+ with check_warnings(('', RuntimeWarning)):
+ re.compile(r'(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 --git a/Misc/NEWS b/Misc/NEWS
index 51aa4e9..bd96880 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -18,6 +18,10 @@ Core and Builtins
Library
-------
+- Issues #814253, #9179: Warnings now are raised when group references and
+ conditional group references are used in lookbehind assertions in regular
+ expressions.
+
- Issue #23215: Multibyte codecs with custom error handlers that ignores errors
consumed too much memory and raised SystemError or MemoryError.
Original patch by Aleksi Torhamo.