From 39441fce0218a3f51a80cf17aa179a32651a02f6 Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Sat, 10 Mar 2018 23:01:58 -0800 Subject: [PATCH] bpo-32338: OrderedDict import is no longer needed in re. (GH-4891) (cherry picked from commit b931bd0a2fe7e9293339019352baf3317166b769) Co-authored-by: Serhiy Storchaka --- Lib/re.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/Lib/re.py b/Lib/re.py index a8b6753d39..94d486579e 100644 --- a/Lib/re.py +++ b/Lib/re.py @@ -128,12 +128,6 @@ try: except ImportError: _locale = None -# try _collections first to reduce startup cost -try: - from _collections import OrderedDict -except ImportError: - from collections import OrderedDict - # public symbols __all__ = [ @@ -271,7 +265,7 @@ Match = type(sre_compile.compile('', 0).match('')) # -------------------------------------------------------------------- # internals -_cache = OrderedDict() +_cache = {} # ordered! _MAXCACHE = 512 def _compile(pattern, flags): @@ -292,9 +286,10 @@ def _compile(pattern, flags): p = sre_compile.compile(pattern, flags) if not (flags & DEBUG): if len(_cache) >= _MAXCACHE: + # Drop the oldest item try: - _cache.popitem(last=False) - except KeyError: + del _cache[next(iter(_cache))] + except (StopIteration, RuntimeError, KeyError): pass _cache[type(pattern), pattern, flags] = p return p -- 2.50.0