summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2016-09-18 20:17:21 -0700
committerRaymond Hettinger <python@rcn.com>2016-09-18 20:17:21 -0700
commit5820f3a3814f0e4983229424388a5e2964758b03 (patch)
tree74ef5301437a338008b501cb9e220f0f32bfbf92
parent5d4b09c106e2e3b7d17dd1b904568eb2ff7353d3 (diff)
downloadcpython-git-5820f3a3814f0e4983229424388a5e2964758b03.tar.gz
Issue #28193: Use lru_cache in the re module.
-rw-r--r--Lib/re.py15
1 files changed, 4 insertions, 11 deletions
diff --git a/Lib/re.py b/Lib/re.py
index 0850f0db8d..d321cff92c 100644
--- a/Lib/re.py
+++ b/Lib/re.py
@@ -122,6 +122,7 @@ This module also defines an exception 'error'.
import enum
import sre_compile
import sre_parse
+import functools
try:
import _locale
except ImportError:
@@ -234,7 +235,7 @@ def compile(pattern, flags=0):
def purge():
"Clear the regular expression caches"
_cache.clear()
- _cache_repl.clear()
+ _compile_repl.cache_clear()
def template(pattern, flags=0):
"Compile a template pattern, returning a pattern object"
@@ -278,7 +279,6 @@ def escape(pattern):
# internals
_cache = {}
-_cache_repl = {}
_pattern_type = type(sre_compile.compile("", 0))
@@ -311,17 +311,10 @@ def _compile(pattern, flags):
_cache[type(pattern), pattern, flags] = p, loc
return p
+@functools.lru_cache(_MAXCACHE)
def _compile_repl(repl, pattern):
# internal: compile replacement pattern
- try:
- return _cache_repl[repl, pattern]
- except KeyError:
- pass
- p = sre_parse.parse_template(repl, pattern)
- if len(_cache_repl) >= _MAXCACHE:
- _cache_repl.clear()
- _cache_repl[repl, pattern] = p
- return p
+ return sre_parse.parse_template(repl, pattern)
def _expand(pattern, match, template):
# internal: match.expand implementation hook