Bump twisted from 23.8.0 to 23.10.0 (#16588)

matrix-org · Nov 1, 2023 · c812f43 · c812f43
1 parent ed1b879
commit c812f43
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/changelog.d/16588.misc b/changelog.d/16588.misc
@@ -0,0 +1 @@
+Bump twisted from 23.8.0 to 23.10.0.
diff --git a/poetry.lock b/poetry.lock
diff --git a/synapse/util/__init__.py b/synapse/util/__init__.py
@@ -93,7 +93,7 @@ class Clock:
 
     _reactor: IReactorTime = attr.ib()
 
-    @defer.inlineCallbacks  # type: ignore[arg-type]  # Issue in Twisted's type annotations
+    @defer.inlineCallbacks
     def sleep(self, seconds: float) -> "Generator[Deferred[float], Any, Any]":
         d: defer.Deferred[float] = defer.Deferred()
         with context.PreserveLoggingContext():

diff --git a/tests/http/__init__.py b/tests/http/__init__.py
@@ -182,7 +182,7 @@ def wrap_server_factory_for_tls(
         )
     else:
         return TLSMemoryBIOFactory(
-            connection_creator, isClient=False, wrappedFactory=factory, clock=clock  # type: ignore[call-arg]
+            connection_creator, isClient=False, wrappedFactory=factory, clock=clock
         )
 
 

diff --git a/tests/server.py b/tests/server.py
@@ -484,7 +484,7 @@ def getHostByName(
         if twisted.version > Version("Twisted", 23, 8, 0):
             from twisted.protocols import tls
 
-            tls._get_default_clock = lambda: self  # type: ignore[attr-defined]
+            tls._get_default_clock = lambda: self
 
         self.nameResolver = SimpleResolverComplexifier(FakeResolver())
         super().__init__()
-Original file line number
+Diff line change
@@ Expand Up / @@ -182,7 +182,7 @@ def wrap_server_factory_for_tls( @@
             )
         else:
             return TLSMemoryBIOFactory(
-                connection_creator, isClient=False, wrappedFactory=factory, clock=clock  # type: ignore[call-arg]
+                connection_creator, isClient=False, wrappedFactory=factory, clock=clock
             )
@@ Expand Down @@