diff --git a/Lib/collections.py b/Lib/collections.py index fb6766e2a54..c3c51d120fa 100644 --- a/Lib/collections.py +++ b/Lib/collections.py @@ -173,7 +173,7 @@ class OrderedDict(dict, MutableMapping): def __del__(self): self.clear() # eliminate cyclical references - def _move_to_end(self, key, PREV=0, NEXT=1): + def _renew(self, key, PREV=0, NEXT=1): 'Fast version of self[key]=self.pop(key). Private method for internal use.' link = self.__map[key] link_prev = link[PREV] diff --git a/Lib/functools.py b/Lib/functools.py index f9e35d857ab..11843b72ca2 100644 --- a/Lib/functools.py +++ b/Lib/functools.py @@ -128,6 +128,7 @@ def lru_cache(maxsize=100): def decorating_function(user_function, tuple=tuple, sorted=sorted, len=len, KeyError=KeyError): cache = OrderedDict() # ordered least recent to most recent + cache_popitem, cache_renew = cache.popitem, cache._renew kwd_mark = object() # separate positional and keyword args lock = Lock() @@ -139,7 +140,7 @@ def lru_cache(maxsize=100): try: with lock: result = cache[key] - cache._move_to_end(key) # record recent use of this key + cache_renew(key) # record recent use of this key wrapper.hits += 1 except KeyError: result = user_function(*args, **kwds) @@ -147,7 +148,7 @@ def lru_cache(maxsize=100): cache[key] = result # record recent use of this key wrapper.misses += 1 if len(cache) > maxsize: - cache.popitem(0) # purge least recently used cache entry + cache_popitem(0) # purge least recently used cache entry return result def clear():