[Python-checkins] cpython (merge 3.3 -> default): Merge

Fri Mar 1 13:02:03 CET 2013

http://hg.python.org/cpython/rev/dd341e1e30a7
changeset: 82438:dd341e1e30a7
parent: 82436:a066466fddd3
parent: 82437:1920422626a5
user: Raymond Hettinger <python at rcn.com>
date: Fri Mar 01 03:48:30 2013 -0800
summary:
 Merge
files:
 Lib/functools.py | 6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Lib/functools.py b/Lib/functools.py
--- 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 @@
 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
 
-- 
Repository URL: http://hg.python.org/cpython
