mirror of
https://github.com/python/cpython.git
synced 2025-08-30 21:48:47 +00:00
Issue #22410: Module level functions in the re module now cache compiled
locale-dependent regular expressions taking into account the locale.
This commit is contained in:
parent
35903c809f
commit
4659cc0756
3 changed files with 49 additions and 2 deletions
11
Lib/re.py
11
Lib/re.py
|
@ -122,6 +122,7 @@ This module also defines an exception 'error'.
|
|||
import sys
|
||||
import sre_compile
|
||||
import sre_parse
|
||||
import _locale
|
||||
|
||||
# public symbols
|
||||
__all__ = [ "match", "fullmatch", "search", "sub", "subn", "split", "findall",
|
||||
|
@ -275,7 +276,9 @@ def _compile(pattern, flags):
|
|||
bypass_cache = flags & DEBUG
|
||||
if not bypass_cache:
|
||||
try:
|
||||
return _cache[type(pattern), pattern, flags]
|
||||
p, loc = _cache[type(pattern), pattern, flags]
|
||||
if loc is None or loc == _locale.setlocale(_locale.LC_CTYPE):
|
||||
return p
|
||||
except KeyError:
|
||||
pass
|
||||
if isinstance(pattern, _pattern_type):
|
||||
|
@ -289,7 +292,11 @@ def _compile(pattern, flags):
|
|||
if not bypass_cache:
|
||||
if len(_cache) >= _MAXCACHE:
|
||||
_cache.clear()
|
||||
_cache[type(pattern), pattern, flags] = p
|
||||
if p.flags & LOCALE:
|
||||
loc = _locale.setlocale(_locale.LC_CTYPE)
|
||||
else:
|
||||
loc = None
|
||||
_cache[type(pattern), pattern, flags] = p, loc
|
||||
return p
|
||||
|
||||
def _compile_repl(repl, pattern):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue