mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

SRE bug #441409:

Browse source 
compile should raise error for non-strings
SRE bug #432570, 448951:
    reset group after failed match

also bumped version number to 2.2.0
This commit is contained in:
Fredrik Lundh 2001-10-18 19:30:16 +00:00
parent 3bb4d214a4
commit 397a654791
3 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Lib/sre.py
View file

@ -104,7 +104,7 @@ __all__ = [ "match", "search", "sub", "subn", "split", "findall",
"U", "IGNORECASE", "LOCALE", "MULTILINE", "DOTALL", "VERBOSE", "U", "IGNORECASE", "LOCALE", "MULTILINE", "DOTALL", "VERBOSE",
"UNICODE", "error" ] "UNICODE", "error" ]
__version__ = "2.1.1" __version__ = "2.2.0"
# this module works under 1.5.2 and later. don't use string methods # this module works under 1.5.2 and later. don't use string methods
import string import string
@ -197,6 +197,8 @@ def escape(pattern):
_cache = {} _cache = {}
_cache_repl = {} _cache_repl = {}
_pattern_type = type(sre_compile.compile("", 0))
_MAXCACHE = 100 _MAXCACHE = 100
def _join(seq, sep): def _join(seq, sep):
@ -209,8 +211,10 @@ def _compile(*key):
if p is not None: if p is not None:
return p return p
pattern, flags = key pattern, flags = key
if type(pattern) not in sre_compile.STRING_TYPES: if type(pattern) is _pattern_type:
return pattern return pattern
if type(pattern) not in sre_compile.STRING_TYPES:
raise TypeError, "first argument must be string or compiled pattern"
try: try:
p = sre_compile.compile(pattern, flags) p = sre_compile.compile(pattern, flags)
except error, v: except error, v:
@ -312,7 +316,7 @@ import copy_reg
def _pickle(p): def _pickle(p):
return _compile, (p.pattern, p.flags) return _compile, (p.pattern, p.flags)
copy_reg.pickle(type(_compile("", 0)), _pickle, _compile) copy_reg.pickle(_pattern_type, _pickle, _compile)
# -------------------------------------------------------------------- # --------------------------------------------------------------------
# experimental stuff (see python-dev discussions for details) # experimental stuff (see python-dev discussions for details)

6
Lib/test/test_sre.py
View file

@ -204,6 +204,12 @@ test(r"""pat.match('a').group(1, 2, 3)""", ('a', None, None))
test(r"""pat.match('b').group('a1', 'b2', 'c3')""", (None, 'b', None)) test(r"""pat.match('b').group('a1', 'b2', 'c3')""", (None, 'b', None))
test(r"""pat.match('ac').group(1, 'b2', 3)""", ('a', None, 'c')) test(r"""pat.match('ac').group(1, 'b2', 3)""", ('a', None, 'c'))
# bug 448951 (similar to 429357, but with single char match)
# (Also test greedy matches.)
for op in '','?','*':
test(r"""sre.match(r'((.%s):)?z', 'z').groups()"""%op, (None, None))
test(r"""sre.match(r'((.%s):)?z', 'a:z').groups()"""%op, ('a:', 'a'))
if verbose: if verbose:
print "Running tests on sre.escape" print "Running tests on sre.escape"

4
Modules/_sre.c
View file

@ -32,6 +32,7 @@
* 2001-05-14 fl fixes for 1.5.2 * 2001-05-14 fl fixes for 1.5.2
* 2001-07-01 fl added BIGCHARSET support (from Martin von Loewis) * 2001-07-01 fl added BIGCHARSET support (from Martin von Loewis)
* 2001-09-18 fl added _getliteral helper * 2001-09-18 fl added _getliteral helper
* 2001-10-18 fl fixed group reset issue (from Matthew Mueller)
* *
* Copyright (c) 1997-2001 by Secret Labs AB. All rights reserved. * Copyright (c) 1997-2001 by Secret Labs AB. All rights reserved.
* *
@ -47,7 +48,7 @@
#ifndef SRE_RECURSIVE #ifndef SRE_RECURSIVE
static char copyright[] = static char copyright[] =
" SRE 2.1.1 Copyright (c) 1997-2001 by Secret Labs AB "; " SRE 2.2.0 Copyright (c) 1997-2001 by Secret Labs AB ";
#include "Python.h" #include "Python.h"
#include "structmember.h" /* offsetof */ #include "structmember.h" /* offsetof */
@ -1061,6 +1062,7 @@ SRE_MATCH(SRE_STATE* state, SRE_CODE* pattern, int level)
if (i) if (i)
return i; return i;
i = mark_restore(state, 0, lastmark); i = mark_restore(state, 0, lastmark);
state->lastmark = lastmark;
if (i < 0) if (i < 0)
return i; return i;
rp->count = count - 1; rp->count = count - 1;