traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Sync-up with 3.7 by backporting minor lru_cache code beautification

This commit is contained in:
Raymond Hettinger 2017-01-08 18:22:24 -08:00
parent 4ee39141e8
commit 19c7238560
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Lib/functools.py
View File

@ -492,6 +492,7 @@ def _lru_cache_wrapper(user_function, maxsize, typed, _CacheInfo):
hits = misses = 0 hits = misses = 0
full = False full = False
cache_get = cache.get # bound method to lookup a key or return None cache_get = cache.get # bound method to lookup a key or return None
cache_len = cache.__len__ # get cache size without calling len()
lock = RLock() # because linkedlist updates aren't threadsafe lock = RLock() # because linkedlist updates aren't threadsafe
root = [] # root of the circular doubly linked list root = [] # root of the circular doubly linked list
root[:] = [root, root, None, None] # initialize by pointing to self root[:] = [root, root, None, None] # initialize by pointing to self
@ -573,16 +574,16 @@ def _lru_cache_wrapper(user_function, maxsize, typed, _CacheInfo):
last = root[PREV] last = root[PREV]
link = [last, root, key, result] link = [last, root, key, result]
last[NEXT] = root[PREV] = cache[key] = link last[NEXT] = root[PREV] = cache[key] = link
# Use the __len__() method instead of the len() function # Use the cache_len bound method instead of the len() function
# which could potentially be wrapped in an lru_cache itself. # which could potentially be wrapped in an lru_cache itself.
full = (cache.__len__() >= maxsize) full = (cache_len() >= maxsize)
misses += 1 misses += 1
return result return result
def cache_info(): def cache_info():
"""Report cache statistics""" """Report cache statistics"""
with lock: with lock:
return _CacheInfo(hits, misses, maxsize, cache.__len__()) return _CacheInfo(hits, misses, maxsize, cache_len())
def cache_clear(): def cache_clear():
"""Clear the cache and cache statistics""" """Clear the cache and cache statistics"""