Merge

rhettinger · rhettinger · commit dacb6858e88b · 2013-03-01T03:48:30.000-08:00
diff --git a/Lib/functools.py b/Lib/functools.py
@@ -17,9 +17,9 @@
     pass
 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
 
 
 ################################################################################
@@ -232,7 +232,7 @@ def decorating_function(user_function):
         hits = misses = 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
 
