diff options
| author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2020-06-16 10:13:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-16 10:13:59 +0100 |
| commit | 3e6b5bba7177274db5533cc5aae0a0f8acf71597 (patch) | |
| tree | 4fac13d0e459d55dbeac146bd4653fbfa6d9189f /synapse | |
| parent | Merge pull request #7685 from matrix-org/babolivier/3pid_r0 (diff) | |
| download | synapse-3e6b5bba7177274db5533cc5aae0a0f8acf71597.tar.xz | |
Wrap register_device coroutine in an ensureDeferred (#7684)
Fixes https://github.com/matrix-org/synapse/issues/7683 Broke in: #7649 We had a `yield` acting on a coroutine. To be fair this one is a bit difficult to notice as there's a function in the middle that just passes the coroutine along.
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/module_api/__init__.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/synapse/module_api/__init__.py b/synapse/module_api/__init__.py index ecdf1ad69f..a7849cefa5 100644 --- a/synapse/module_api/__init__.py +++ b/synapse/module_api/__init__.py @@ -126,7 +126,7 @@ class ModuleApi(object): 'errcode' property for more information on the reason for failure Returns: - Deferred[str]: user_id + defer.Deferred[str]: user_id """ return defer.ensureDeferred( self._hs.get_registration_handler().register_user( @@ -149,10 +149,12 @@ class ModuleApi(object): Returns: defer.Deferred[tuple[str, str]]: Tuple of device ID and access token """ - return self._hs.get_registration_handler().register_device( - user_id=user_id, - device_id=device_id, - initial_display_name=initial_display_name, + return defer.ensureDeferred( + self._hs.get_registration_handler().register_device( + user_id=user_id, + device_id=device_id, + initial_display_name=initial_display_name, + ) ) def record_user_external_id( |