Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Bump twisted from 23.8.0 to 23.10.0 #16588

Merged
merged 3 commits into from
Nov 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/16588.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Bump twisted from 23.8.0 to 23.10.0.
17 changes: 8 additions & 9 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion synapse/util/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
2 changes: 1 addition & 1 deletion tests/http/__init__.py
Original file line number Diff 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
2 changes: 1 addition & 1 deletion tests/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__()
Expand Down
Loading