Accept optional lock object in Condition ctor (tulip issue #198)
diff --git a/Lib/asyncio/locks.py b/Lib/asyncio/locks.py
index 8d9e3b4..574e361 100644
--- a/Lib/asyncio/locks.py
+++ b/Lib/asyncio/locks.py
@@ -255,14 +255,17 @@
A new Lock object is created and used as the underlying lock.
"""
- def __init__(self, *, loop=None):
+ def __init__(self, lock=None, *, loop=None):
if loop is not None:
self._loop = loop
else:
self._loop = events.get_event_loop()
- # Lock as an attribute as in threading.Condition.
- lock = Lock(loop=self._loop)
+ if lock is None:
+ lock = Lock(loop=self._loop)
+ elif lock._loop is not self._loop:
+ raise ValueError("loop argument must agree with lock")
+
self._lock = lock
# Export the lock's locked(), acquire() and release() methods.
self.locked = lock.locked
diff --git a/Lib/test/test_asyncio/test_locks.py b/Lib/test/test_asyncio/test_locks.py
index 8ad1486..c4e74e3 100644
--- a/Lib/test/test_asyncio/test_locks.py
+++ b/Lib/test/test_asyncio/test_locks.py
@@ -656,6 +656,18 @@
self.assertFalse(cond.locked())
+ def test_explicit_lock(self):
+ lock = asyncio.Lock(loop=self.loop)
+ cond = asyncio.Condition(lock, loop=self.loop)
+
+ self.assertIs(lock._loop, cond._loop)
+
+ def test_ambiguous_loops(self):
+ loop = self.new_test_loop()
+ lock = asyncio.Lock(loop=self.loop)
+ with self.assertRaises(ValueError):
+ asyncio.Condition(lock, loop=loop)
+
class SemaphoreTests(test_utils.TestCase):