Replace 'deadline' with 'timeout' for Lock.acquire.

diff --git a/tornado/locks.py b/tornado/locks.py
index 77340abcc47b0f0934c7825aa338e4d4a7f4767f..4b0bdb38f1ea148bfab350a2b5590602d3a876f3 100644 (file)
--- 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 49161287dc4daa0ed1f9332779edca6845852fab..90bdafaa6020a64057b8299eace09785a13dfb05 100644 (file)
--- 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())