Don't deadlock on a reentrant call.

diff --git a/Lib/functools.py b/Lib/functools.py
index 226a46eb21c60adc110a64dcf338084526ffd409..71022e53c8f62c235dfadef20fba932a891f923a 100644 (file)
--- 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