diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-11-30 16:51:48 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-11-30 16:51:48 (GMT) |
| commit | d5355178ad0abfe5c1f1d0b51ddd3de7e19eabc6 (patch) | |
| tree | 3f5fcd0334b40f55875f2327e4fcf758adab7595 /Lib/re.py | |
| parent | ca9810a7f73cd04df46359d97574abddef19483e (diff) | |
| parent | f8c8d2e36640ee44da4faa42cc3d58ac395cd03f (diff) | |
| download | cpython-d5355178ad0abfe5c1f1d0b51ddd3de7e19eabc6.zip cpython-d5355178ad0abfe5c1f1d0b51ddd3de7e19eabc6.tar.gz cpython-d5355178ad0abfe5c1f1d0b51ddd3de7e19eabc6.tar.bz2 | |
merge 2.7.9 release branch
Diffstat (limited to 'Lib/re.py')
| -rw-r--r-- | Lib/re.py | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -312,11 +312,10 @@ class Scanner: s = sre_parse.Pattern() s.flags = flags for phrase, action in lexicon: - gid = s.opengroup() p.append(sre_parse.SubPattern(s, [ - (SUBPATTERN, (gid, sre_parse.parse(phrase, flags))), + (SUBPATTERN, (len(p)+1, sre_parse.parse(phrase, flags))), ])) - s.closegroup(gid, p[-1]) + s.groups = len(p)+1 p = sre_parse.SubPattern(s, [(BRANCH, (None, p))]) self.scanner = sre_compile.compile(p) def scan(self, string): |