From 9a3e208a7baaeaf90c2db8505253a46240eed784 Mon Sep 17 00:00:00 2001 From: David Robertson Date: Tue, 15 Nov 2022 14:00:10 +0000 Subject: [PATCH] Fix typechecking errors introduced in #14128 --- synapse/app/_base.py | 2 +- synapse/app/generic_worker.py | 3 +++ synapse/app/homeserver.py | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/synapse/app/_base.py b/synapse/app/_base.py index 8f5b1a20f517..ab84b488595e 100644 --- a/synapse/app/_base.py +++ b/synapse/app/_base.py @@ -365,7 +365,7 @@ def listen_http( version_string: str, max_request_body_size: int, context_factory: IOpenSSLContextFactory, - reactor: IReactorSSL = reactor, + reactor: ISynapseReactor = reactor, ) -> List[Port]: port = listener_config.port bind_addresses = listener_config.bind_addresses diff --git a/synapse/app/generic_worker.py b/synapse/app/generic_worker.py index 1d9aef45c24b..c0f4d5910b18 100644 --- a/synapse/app/generic_worker.py +++ b/synapse/app/generic_worker.py @@ -389,6 +389,9 @@ def _listen_http(self, listener_config: ListenerConfig) -> None: root_resource = create_resource_tree(resources, OptionsResource()) + # tls_server_context_factory is set by `refresh_certificate`, not in the + # homeserver constructor. Reassure mypy that we have set a context factory. + assert self.tls_server_context_factory is not None _base.listen_http( listener_config, root_resource, diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 4f4fee4782f2..9500d590ff35 100644 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -136,6 +136,9 @@ def _listener_http( else: root_resource = OptionsResource() + # tls_server_context_factory is set by `refresh_certificate`, not in the + # homeserver constructor. Reassure mypy that we have set a context factory. + assert self.tls_server_context_factory is not None ports = listen_http( listener_config, create_resource_tree(resources, root_resource),