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

Reduce the number of "untyped defs" #12716

Merged
merged 14 commits into from
May 12, 2022
Merged

Reduce the number of "untyped defs" #12716

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
7cf850e
Brief annotation in s.storage.types
May 11, 2022
965ca4c
Annotation in s.http.request_metrics
May 11, 2022
8e11e43
type annotations in s.http.matrixfederationclient
May 11, 2022
f16a82e
Extra annotations in s.http.federation
May 11, 2022
aac36ff
Extra annotation in s.groups
May 11, 2022
77d29f7
Annotate `_make_scheduler`
May 11, 2022
192ecf9
Additional annotations in s.http.client
May 11, 2022
6979a84
Annotations in `s.storage.persist_events`
May 11, 2022
d464f66
Annotations in s.storage.state
May 11, 2022
a225fda
Annotations in s.storage.databases.main.stream
May 11, 2022
cb1f07f
Annotation in s.storage.prepare_database
May 11, 2022
ed24f87
Easy annotations in s.storage.database
May 11, 2022
a5133c2
Changelog
May 11, 2022
ebc5686
Use `auto_attribs` for WellKnownLookupResult
May 12, 2022
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
8 changes: 4 additions & 4 deletions synapse/http/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -779,7 +779,7 @@ async def get_file(
)


def _timeout_to_request_timed_out_error(f: Failure):
def _timeout_to_request_timed_out_error(f: Failure) -> Failure:
if f.check(twisted_error.TimeoutError, twisted_error.ConnectingCancelledError):
# The TCP connection has its own timeout (set by the 'connectTimeout' param
# on the Agent), which raises twisted_error.TimeoutError exception.
Expand Down Expand Up @@ -813,7 +813,7 @@ class _DiscardBodyWithMaxSizeProtocol(protocol.Protocol):
def __init__(self, deferred: defer.Deferred):
self.deferred = deferred

def _maybe_fail(self):
def _maybe_fail(self) -> None:
"""
Report a max size exceed error and disconnect the first time this is called.
"""
Expand Down Expand Up @@ -937,12 +937,12 @@ class InsecureInterceptableContextFactory(ssl.ContextFactory):
Do not use this since it allows an attacker to intercept your communications.
"""

def __init__(self):
def __init__(self) -> None:
self._context = SSL.Context(SSL.SSLv23_METHOD)
self._context.set_verify(VERIFY_NONE, lambda *_: False)

def getContext(self, hostname=None, port=None):
return self._context

def creatorForNetloc(self, hostname, port):
def creatorForNetloc(self, hostname: bytes, port: int):
return self
Comment on lines +947 to 948
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is supposed to return IOpenSSLClientConnectionCreator, but as far as I can see InsecureInterceptableContextFactory doesn't implement that interface. I chose to ignore this because this is meant to be for testing only.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I ran into this too, there's a bit of funkiness in some of these interfaces that they don't all seem to be accurate.