From fd54117a682224200ce057a60b0205b0e13948d2 Mon Sep 17 00:00:00 2001 From: Raymond Hettinger Date: Fri, 1 Mar 2013 03:47:57 -0800 Subject: [PATCH] Don't deadlock on a reentrant call. --- Lib/functools.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Lib/functools.py b/Lib/functools.py index 226a46eb21c..71022e53c8f 100644 --- a/Lib/functools.py +++ b/Lib/functools.py @@ -14,9 +14,9 @@ __all__ = ['update_wrapper', 'wraps', 'WRAPPER_ASSIGNMENTS', 'WRAPPER_UPDATES', from _functools import partial, reduce from collections import namedtuple try: - from _thread import allocate_lock as Lock + from _thread import RLock except: - from _dummy_thread import allocate_lock as Lock + from dummy_threading import RLock ################################################################################ @@ -207,7 +207,7 @@ def lru_cache(maxsize=128, typed=False): hits = misses = currsize = 0 full = False cache_get = cache.get # bound method to lookup a key or return None - lock = Lock() # because linkedlist updates aren't threadsafe + lock = RLock() # because linkedlist updates aren't threadsafe root = [] # root of the circular doubly linked list root[:] = [root, root, None, None] # initialize by pointing to self