summary refs log tree commit diff
path: root/synapse/util/patch_inline_callbacks.py
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2024-12-20 10:57:59 +0000
committerGitHub <noreply@github.com>2024-12-20 10:57:59 +0000
commitd69c00b5a19ba45645665afa532421b25c74407a (patch)
treebda017e2da19ec213aaccd5d4fd8a95b297efaab /synapse/util/patch_inline_callbacks.py
parentRemove support for PostgreSQL 11 and 12 (#18034) (diff)
downloadsynapse-d69c00b5a19ba45645665afa532421b25c74407a.tar.xz
Stop using twisted.internet.defer.returnValue (#18020)
`defer.returnValue` was only needed in Python 2; in Python 3, a simple
`return` is fine.

`twisted.internet.defer.returnValue` is deprecated as of Twisted 24.7.0.

Most uses of `returnValue` in synapse were removed a while back; this
cleans up some remaining bits.
Diffstat (limited to '')
-rw-r--r--synapse/util/patch_inline_callbacks.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/util/patch_inline_callbacks.py b/synapse/util/patch_inline_callbacks.py

index 56bdf451da..beea4d2888 100644 --- a/synapse/util/patch_inline_callbacks.py +++ b/synapse/util/patch_inline_callbacks.py
@@ -162,7 +162,7 @@ def _check_yield_points( d = result.throwExceptionIntoGenerator(gen) else: d = gen.send(result) - except (StopIteration, defer._DefGen_Return) as e: + except StopIteration as e: if current_context() != expected_context: # This happens when the context is lost sometime *after* the # final yield and returning. E.g. we forgot to yield on a @@ -183,7 +183,7 @@ def _check_yield_points( ) ) changes.append(err) - # The `StopIteration` or `_DefGen_Return` contains the return value from the + # The `StopIteration` contains the return value from the # generator. return cast(T, e.value)