mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

- don't hang if group id is followed by whitespace (closes bug #114660)

Browse source
This commit is contained in:
Fredrik Lundh 2000-09-24 14:46:23 +00:00
parent 96753b3482
commit 19f977ba40
3 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/sre_parse.py
View file

@ -634,7 +634,7 @@ def parse_template(source, pattern):
while 1: while 1:
group = _group(this, pattern.groups+1) group = _group(this, pattern.groups+1)
if group: if group:
if (not s.next or if (s.next not in DIGITS or
not _group(this + s.next, pattern.groups+1)): not _group(this + s.next, pattern.groups+1)):
code = MARK, int(group) code = MARK, int(group)
break break

1
Lib/test/re_tests.py
View file

@ -1,6 +1,5 @@
#!/usr/bin/env python #!/usr/bin/env python
# -*- mode: python -*- # -*- mode: python -*-
# $Id$
# Re test suite and benchmark suite v1.5 # Re test suite and benchmark suite v1.5

3
Lib/test/test_sre.py
View file

@ -114,6 +114,9 @@ test(r"""sre.sub(r'^\s*', 'X', 'test')""", 'Xtest')
test(r"""sre.sub(r'a', 'b', 'aaaaa')""", 'bbbbb') test(r"""sre.sub(r'a', 'b', 'aaaaa')""", 'bbbbb')
test(r"""sre.sub(r'a', 'b', 'aaaaa', 1)""", 'baaaa') test(r"""sre.sub(r'a', 'b', 'aaaaa', 1)""", 'baaaa')
# bug 114660
test(r"""sre.sub(r'(\S)\s+(\S)', r'\1 \2', 'hello there')""", 'hello there')
if verbose: if verbose:
print 'Running tests on symbolic references' print 'Running tests on symbolic references'