summaryrefslogtreecommitdiff
path: root/Lib/functools.py
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2013-03-01 23:21:00 -0800
committerRaymond Hettinger <python@rcn.com>2013-03-01 23:21:00 -0800
commit794568f0adc99d812d0d51ec700167a71a7e31df (patch)
tree22ef0edd1cdfd69e897b06ca304a6c44c8613ddf /Lib/functools.py
parentbf0428ebed9f2358004b41b35ea27fb4ccd2ad50 (diff)
parent409f6630918732eb9c088faf51c8210b6ce08b03 (diff)
downloadcpython-git-794568f0adc99d812d0d51ec700167a71a7e31df.tar.gz
Merge
Diffstat (limited to 'Lib/functools.py')
-rw-r--r--Lib/functools.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/Lib/functools.py b/Lib/functools.py
index c71d71420b..a019268d4f 100644
--- 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
################################################################################