diff options
author | Benjamin Peterson <benjamin@python.org> | 2014-11-30 11:51:16 -0500 |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2014-11-30 11:51:16 -0500 |
commit | 16e802f4aed9db71a2e25fa25daa8fed0fc2e539 (patch) | |
tree | 5318e4758c57f22919d053598c1d55696e14d972 /Lib/re.py | |
parent | 27ee75f1913452d7325a1dac7302d402150639f8 (diff) | |
parent | 66323415c791502aec973cc1b4b755d22b8ba210 (diff) | |
download | cpython-git-16e802f4aed9db71a2e25fa25daa8fed0fc2e539.tar.gz |
merge 3.4 (#9179)
Diffstat (limited to 'Lib/re.py')
-rw-r--r-- | Lib/re.py | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -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): |