diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2022-02-08 09:15:59 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-08 09:15:59 -0500 |
| commit | 6c0984e3f007de469af74d8b6a432c8704633b03 (patch) | |
| tree | 556699664b62431032555024fff93ff4c77b1b65 | |
| parent | Merge branch 'master' into develop (diff) | |
| download | synapse-6c0984e3f007de469af74d8b6a432c8704633b03.tar.xz | |
Remove unnecessary ignores due to Twisted upgrade. (#11939)
Twisted 22.1.0 fixed some internal type hints, allowing Synapse to remove ignore calls for parameters to connectTCP.
| -rw-r--r-- | changelog.d/11939.misc | 1 | ||||
| -rw-r--r-- | synapse/handlers/send_email.py | 2 | ||||
| -rw-r--r-- | synapse/replication/tcp/handler.py | 4 | ||||
| -rw-r--r-- | synapse/replication/tcp/redis.py | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/changelog.d/11939.misc b/changelog.d/11939.misc new file mode 100644 index 0000000000..317526f9ef --- /dev/null +++ b/changelog.d/11939.misc @@ -0,0 +1 @@ +Remove an unnecessary ignoring of type hints due to fixes in upstream packages. diff --git a/synapse/handlers/send_email.py b/synapse/handlers/send_email.py index 1a062a784c..a305a66860 100644 --- a/synapse/handlers/send_email.py +++ b/synapse/handlers/send_email.py @@ -106,7 +106,7 @@ async def _sendmail( factory = build_sender_factory(hostname=smtphost if enable_tls else None) reactor.connectTCP( - smtphost, # type: ignore[arg-type] + smtphost, smtpport, factory, timeout=30, diff --git a/synapse/replication/tcp/handler.py b/synapse/replication/tcp/handler.py index 21293038ef..f7e6bc1e62 100644 --- a/synapse/replication/tcp/handler.py +++ b/synapse/replication/tcp/handler.py @@ -318,7 +318,7 @@ class ReplicationCommandHandler: hs, outbound_redis_connection ) hs.get_reactor().connectTCP( - hs.config.redis.redis_host, # type: ignore[arg-type] + hs.config.redis.redis_host, hs.config.redis.redis_port, self._factory, timeout=30, @@ -330,7 +330,7 @@ class ReplicationCommandHandler: host = hs.config.worker.worker_replication_host port = hs.config.worker.worker_replication_port hs.get_reactor().connectTCP( - host, # type: ignore[arg-type] + host, port, self._factory, timeout=30, diff --git a/synapse/replication/tcp/redis.py b/synapse/replication/tcp/redis.py index 8d28bd3f3f..5b37f379d0 100644 --- a/synapse/replication/tcp/redis.py +++ b/synapse/replication/tcp/redis.py @@ -373,7 +373,7 @@ def lazyConnection( reactor = hs.get_reactor() reactor.connectTCP( - host, # type: ignore[arg-type] + host, port, factory, timeout=30, |