mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 11:44:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

merge 3.4 (#9179)

Browse source
This commit is contained in:
Benjamin Peterson 2014-11-30 11:51:16 -05:00
commit 16e802f4ae
4 changed files with 12 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Lib/re.py
View file

@ -351,11 +351,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):