From 8b1c466cbf12d593255457247404c00f9c7fa4c1 Mon Sep 17 00:00:00 2001 From: "A. Jesse Jiryu Davis" Date: Sat, 18 Apr 2015 22:43:56 -0400 Subject: [PATCH] Replace 'deadline' with 'timeout' for Lock.acquire. --- tornado/locks.py | 4 ++-- tornado/test/locks_test.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tornado/locks.py b/tornado/locks.py index 77340abcc..4b0bdb38f 100644 --- a/tornado/locks.py +++ b/tornado/locks.py @@ -433,13 +433,13 @@ class Lock(object): self.__class__.__name__, self._block) - def acquire(self, deadline=None): + def acquire(self, timeout=None): """Attempt to lock. Returns a Future. Returns a Future, which raises `tornado.gen.TimeoutError` after a timeout. """ - return self._block.acquire(deadline) + return self._block.acquire(timeout) def release(self): """Unlock. diff --git a/tornado/test/locks_test.py b/tornado/test/locks_test.py index 49161287d..90bdafaa6 100644 --- a/tornado/test/locks_test.py +++ b/tornado/test/locks_test.py @@ -448,7 +448,7 @@ class LockTests(AsyncTestCase): lock = locks.Lock() lock.acquire() with self.assertRaises(gen.TimeoutError): - yield lock.acquire(deadline=timedelta(seconds=0.01)) + yield lock.acquire(timeout=timedelta(seconds=0.01)) # Still locked. self.assertFalse(lock.acquire().done()) -- 2.47.2