mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Issue 13177: Make tracebacks more readable by avoiding chained exceptions in the lru_cache.

Browse source
This commit is contained in:
Raymond Hettinger 2011-10-15 23:50:42 -07:00
parent 9be57231dd
commit 4b779b3785
3 changed files with 39 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Lib/functools.py
View file

@ -141,7 +141,7 @@ def lru_cache(maxsize=100):
hits = misses = 0
kwd_mark = (object(),) # separates positional and keyword args
lock = Lock() # needed because ordereddicts aren't threadsafe
lock = Lock() # needed because OrderedDict isn't threadsafe
if maxsize is None:
cache = dict() # simple cache without ordering or size limit
@ -155,13 +155,15 @@ def lru_cache(maxsize=100):
try:
result = cache[key]
hits += 1
return result
except KeyError:
result = user_function(*args, **kwds)
cache[key] = result
misses += 1
pass
result = user_function(*args, **kwds)
cache[key] = result
misses += 1
return result
else:
cache = OrderedDict() # ordered least recent to most recent
cache = OrderedDict() # ordered least recent to most recent
cache_popitem = cache.popitem
cache_renew = cache.move_to_end
@ -171,18 +173,20 @@ def lru_cache(maxsize=100):
key = args
if kwds:
key += kwd_mark + tuple(sorted(kwds.items()))
try:
with lock:
with lock:
try:
result = cache[key]
cache_renew(key) # record recent use of this key
cache_renew(key) # record recent use of this key
hits += 1
except KeyError:
result = user_function(*args, **kwds)
with lock:
cache[key] = result # record recent use of this key
misses += 1
if len(cache) > maxsize:
cache_popitem(0) # purge least recently used cache entry
return result
except KeyError:
pass
result = user_function(*args, **kwds)
with lock:
cache[key] = result # record recent use of this key
misses += 1
if len(cache) > maxsize:
cache_popitem(0) # purge least recently used cache entry
return result
def cache_info():