mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2024-07-06 19:43:55 +00:00
961ee75a9b
Of note: * No untyped defs in `register_new_matrix_user` This one might be contraversial. `request_registration` has three dependency-injection arguments used for testing. I'm removing the injection of the `requests` module and using `unitest.mock.patch` in the test cases instead. Doing `reveal_type(requests)` and `reveal_type(requests.get)` before the change: ``` synapse/_scripts/register_new_matrix_user.py:45: note: Revealed type is "Any" synapse/_scripts/register_new_matrix_user.py:46: note: Revealed type is "Any" ``` And after: ``` synapse/_scripts/register_new_matrix_user.py:44: note: Revealed type is "types.ModuleType" synapse/_scripts/register_new_matrix_user.py:45: note: Revealed type is "def (url: Union[builtins.str, builtins.bytes], params: Union[Union[_typeshed.SupportsItems[Union[builtins.str, builtins.bytes, builtins.int, builtins.float], Union[builtins.str, builtins.bytes, builtins.int, builtins.float, typing.Iterable[Union[builtins.str, builtins.bytes, builtins.int, builtins.float]], None]], Tuple[Union[builtins.str, builtins.bytes, builtins.int, builtins.float], Union[builtins.str, builtins.bytes, builtins.int, builtins.float, typing.Iterable[Union[builtins.str, builtins.bytes, builtins.int, builtins.float]], None]], typing.Iterable[Tuple[Union[builtins.str, builtins.bytes, builtins.int, builtins.float], Union[builtins.str, builtins.bytes, builtins.int, builtins.float, typing.Iterable[Union[builtins.str, builtins.bytes, builtins.int, builtins.float]], None]]], builtins.str, builtins.bytes], None] =, data: Union[Any, None] =, headers: Union[Any, None] =, cookies: Union[Any, None] =, files: Union[Any, None] =, auth: Union[Any, None] =, timeout: Union[Any, None] =, allow_redirects: builtins.bool =, proxies: Union[Any, None] =, hooks: Union[Any, None] =, stream: Union[Any, None] =, verify: Union[Any, None] =, cert: Union[Any, None] =, json: Union[Any, None] =) -> requests.models.Response" ``` * Drive-by comment in `synapse.storage.types` * No untyped defs in `synapse_port_db` This was by far the most painful. I'm happy to break this up into smaller pieces for review if it's not managable as-is.
91 lines
2.3 KiB
Python
91 lines
2.3 KiB
Python
# Copyright 2020 The Matrix.org Foundation C.I.C.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
from typing import Any, Iterator, List, Mapping, Optional, Sequence, Tuple, Union
|
|
|
|
from typing_extensions import Protocol
|
|
|
|
"""
|
|
Some very basic protocol definitions for the DB-API2 classes specified in PEP-249
|
|
"""
|
|
|
|
_Parameters = Union[Sequence[Any], Mapping[str, Any]]
|
|
|
|
|
|
class Cursor(Protocol):
|
|
def execute(self, sql: str, parameters: _Parameters = ...) -> Any:
|
|
...
|
|
|
|
def executemany(self, sql: str, parameters: Sequence[_Parameters]) -> Any:
|
|
...
|
|
|
|
def fetchone(self) -> Optional[Tuple]:
|
|
...
|
|
|
|
def fetchmany(self, size: Optional[int] = ...) -> List[Tuple]:
|
|
...
|
|
|
|
def fetchall(self) -> List[Tuple]:
|
|
...
|
|
|
|
@property
|
|
def description(
|
|
self,
|
|
) -> Optional[
|
|
Sequence[
|
|
# Note that this is an approximate typing based on sqlite3 and other
|
|
# drivers, and may not be entirely accurate.
|
|
# FWIW, the DBAPI 2 spec is: https://peps.python.org/pep-0249/#description
|
|
Tuple[
|
|
str,
|
|
Optional[Any],
|
|
Optional[int],
|
|
Optional[int],
|
|
Optional[int],
|
|
Optional[int],
|
|
Optional[int],
|
|
]
|
|
]
|
|
]:
|
|
...
|
|
|
|
@property
|
|
def rowcount(self) -> int:
|
|
return 0
|
|
|
|
def __iter__(self) -> Iterator[Tuple]:
|
|
...
|
|
|
|
def close(self) -> None:
|
|
...
|
|
|
|
|
|
class Connection(Protocol):
|
|
def cursor(self) -> Cursor:
|
|
...
|
|
|
|
def close(self) -> None:
|
|
...
|
|
|
|
def commit(self) -> None:
|
|
...
|
|
|
|
def rollback(self) -> None:
|
|
...
|
|
|
|
def __enter__(self) -> "Connection":
|
|
...
|
|
|
|
def __exit__(self, exc_type, exc_value, traceback) -> Optional[bool]:
|
|
...
|