Skip to content

Commit bc7df6b

Browse files
cjwatsonbdarnell
authored andcommitted
Fix tests with Twisted 24.7.0
`twisted.internet.defer.returnValue` was needed on Python 2, but on Python 3 a simple `return` statement works fine. Twisted 24.7.0 deprecated the former, causing `tornado.test.twisted_test.ConvertDeferredTest.test_success` to fail.
1 parent d5ba4a1 commit bc7df6b

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

tornado/test/twisted_test.py

+2-5
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@
1818
from tornado.testing import AsyncTestCase, gen_test
1919

2020
try:
21-
from twisted.internet.defer import ( # type: ignore
22-
inlineCallbacks,
23-
returnValue,
24-
)
21+
from twisted.internet.defer import inlineCallbacks # type: ignore
2522

2623
have_twisted = True
2724
except ImportError:
@@ -43,7 +40,7 @@ def fn():
4340
# inlineCallbacks doesn't work with regular functions;
4441
# must have a yield even if it's unreachable.
4542
yield
46-
returnValue(42)
43+
return 42
4744

4845
res = yield fn()
4946
self.assertEqual(res, 42)

0 commit comments

Comments
 (0)