Issue #22410: Module level functions in the re module now cache compiled

locale-dependent regular expressions taking into account the locale.

1 files changed, 9 insertions, 2 deletions

diff --git a/Lib/re.py b/Lib/re.py
index 2e4d87c..46cea2b 100644
--- a/Lib/re.py
+++ b/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):