Merge

rhettinger · rhettinger · commit 794568f0adc9 · 2013-03-01T23:21:00.000-08:00
diff --git a/Lib/functools.py b/Lib/functools.py
@@ -19,7 +19,10 @@
 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
 
 
 ################################################################################
