Merge pull request #3417 from cjwatson/twisted-24.7.0

Fix tests with Twisted 24.7.0
tornadoweb · Aug 19, 2024 · e761622 · e761622
2 parents 1f8b2d7 + 137448d
commit e761622
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/tornado/test/twisted_test.py b/tornado/test/twisted_test.py
@@ -18,10 +18,7 @@
 from tornado.testing import AsyncTestCase, gen_test
 
 try:
-    from twisted.internet.defer import (  # type: ignore
-        inlineCallbacks,
-        returnValue,
-    )
+    from twisted.internet.defer import inlineCallbacks  # type: ignore
 
     have_twisted = True
 except ImportError:
@@ -43,7 +40,7 @@ def fn():
                 # inlineCallbacks doesn't work with regular functions;
                 # must have a yield even if it's unreachable.
                 yield
-            returnValue(42)
+            return 42
 
         res = yield fn()
         self.assertEqual(res, 42)