Merge

2013-03-01 23:21:00 -08:00 · 2013-03-01 23:21:00 -08:00 · 794568f0ad
parent bf0428ebed 409f663091
commit 794568f0ad
1 changed files with 4 additions and 1 deletions
--- a/Lib/functools.py
+++ b/Lib/functools.py
@ -19,7 +19,10 @@ from collections import namedtuple
 try:
    from _thread import RLock
 except:
-    from dummy_threading import RLock
+    class RLock:
+        'Dummy reentrant lock'
+        def __enter__(self): pass
+        def __exit__(self, exctype, excinst, exctb): pass


 ################################################################################