Use PEP 585 syntax in Python 2, protobuf & _ast stubs, where possible (#6949)

This commit is contained in:
Alex Waygood
2022-01-18 15:14:03 +00:00
committed by GitHub
parent aa885ecd65
commit 8af5e0d340
264 changed files with 2217 additions and 2411 deletions

View File

@@ -5,17 +5,13 @@ from typing import (
Any,
AnyStr,
Callable,
Dict,
Generic,
Iterable,
Iterator,
List,
Mapping,
Protocol,
Sequence,
Text,
Tuple,
Type,
TypeVar,
Union,
overload,
@@ -27,10 +23,10 @@ _MessageT = TypeVar("_MessageT", bound=Message)
_MessageData = Union[email.message.Message, bytes, str, IO[str], IO[bytes]]
class _HasIteritems(Protocol):
def iteritems(self) -> Iterator[Tuple[str, _MessageData]]: ...
def iteritems(self) -> Iterator[tuple[str, _MessageData]]: ...
class _HasItems(Protocol):
def items(self) -> Iterator[Tuple[str, _MessageData]]: ...
def items(self) -> Iterator[tuple[str, _MessageData]]: ...
linesep: bytes
@@ -55,12 +51,12 @@ class Mailbox(Generic[_MessageT]):
# As '_ProxyFile' doesn't implement the full IO spec, and BytesIO is incompatible with it, get_file return is Any here
def get_file(self, key: str) -> Any: ...
def iterkeys(self) -> Iterator[str]: ...
def keys(self) -> List[str]: ...
def keys(self) -> list[str]: ...
def itervalues(self) -> Iterator[_MessageT]: ...
def __iter__(self) -> Iterator[_MessageT]: ...
def values(self) -> List[_MessageT]: ...
def iteritems(self) -> Iterator[Tuple[str, _MessageT]]: ...
def items(self) -> List[Tuple[str, _MessageT]]: ...
def values(self) -> list[_MessageT]: ...
def iteritems(self) -> Iterator[tuple[str, _MessageT]]: ...
def items(self) -> list[tuple[str, _MessageT]]: ...
def __contains__(self, key: str) -> bool: ...
def __len__(self) -> int: ...
def clear(self) -> None: ...
@@ -68,8 +64,8 @@ class Mailbox(Generic[_MessageT]):
def pop(self, key: str, default: None = ...) -> _MessageT | None: ...
@overload
def pop(self, key: str, default: _T = ...) -> _MessageT | _T: ...
def popitem(self) -> Tuple[str, _MessageT]: ...
def update(self, arg: _HasIteritems | _HasItems | Iterable[Tuple[str, _MessageData]] | None = ...) -> None: ...
def popitem(self) -> tuple[str, _MessageT]: ...
def update(self, arg: _HasIteritems | _HasItems | Iterable[tuple[str, _MessageData]] | None = ...) -> None: ...
def flush(self) -> None: ...
def lock(self) -> None: ...
def unlock(self) -> None: ...
@@ -80,7 +76,7 @@ class Maildir(Mailbox[MaildirMessage]):
colon: str
def __init__(self, dirname: Text, factory: Callable[[IO[Any]], MaildirMessage] | None = ..., create: bool = ...) -> None: ...
def get_file(self, key: str) -> _ProxyFile[bytes]: ...
def list_folders(self) -> List[str]: ...
def list_folders(self) -> list[str]: ...
def get_folder(self, folder: Text) -> Maildir: ...
def add_folder(self, folder: Text) -> Maildir: ...
def remove_folder(self, folder: Text) -> None: ...
@@ -103,18 +99,18 @@ class MMDF(_mboxMMDF[MMDFMessage]):
class MH(Mailbox[MHMessage]):
def __init__(self, path: Text, factory: Callable[[IO[Any]], MHMessage] | None = ..., create: bool = ...) -> None: ...
def get_file(self, key: str) -> _ProxyFile[bytes]: ...
def list_folders(self) -> List[str]: ...
def list_folders(self) -> list[str]: ...
def get_folder(self, folder: Text) -> MH: ...
def add_folder(self, folder: Text) -> MH: ...
def remove_folder(self, folder: Text) -> None: ...
def get_sequences(self) -> Dict[str, List[int]]: ...
def get_sequences(self) -> dict[str, list[int]]: ...
def set_sequences(self, sequences: Mapping[str, Sequence[int]]) -> None: ...
def pack(self) -> None: ...
class Babyl(_singlefileMailbox[BabylMessage]):
def __init__(self, path: Text, factory: Callable[[IO[Any]], BabylMessage] | None = ..., create: bool = ...) -> None: ...
def get_file(self, key: str) -> IO[bytes]: ...
def get_labels(self) -> List[str]: ...
def get_labels(self) -> list[str]: ...
class Message(email.message.Message):
def __init__(self, message: _MessageData | None = ...) -> None: ...
@@ -133,7 +129,7 @@ class MaildirMessage(Message):
class _mboxMMDFMessage(Message):
def get_from(self) -> str: ...
def set_from(self, from_: str, time_: bool | Tuple[int, int, int, int, int, int, int, int, int] | None = ...) -> None: ...
def set_from(self, from_: str, time_: bool | tuple[int, int, int, int, int, int, int, int, int] | None = ...) -> None: ...
def get_flags(self) -> str: ...
def set_flags(self, flags: Iterable[str]) -> None: ...
def add_flag(self, flag: str) -> None: ...
@@ -142,13 +138,13 @@ class _mboxMMDFMessage(Message):
class mboxMessage(_mboxMMDFMessage): ...
class MHMessage(Message):
def get_sequences(self) -> List[str]: ...
def get_sequences(self) -> list[str]: ...
def set_sequences(self, sequences: Iterable[str]) -> None: ...
def add_sequence(self, sequence: str) -> None: ...
def remove_sequence(self, sequence: str) -> None: ...
class BabylMessage(Message):
def get_labels(self) -> List[str]: ...
def get_labels(self) -> list[str]: ...
def set_labels(self, labels: Iterable[str]) -> None: ...
def add_label(self, label: str) -> None: ...
def remove_label(self, label: str) -> None: ...
@@ -163,13 +159,13 @@ class _ProxyFile(Generic[AnyStr]):
def read(self, size: int | None = ...) -> AnyStr: ...
def read1(self, size: int | None = ...) -> AnyStr: ...
def readline(self, size: int | None = ...) -> AnyStr: ...
def readlines(self, sizehint: int | None = ...) -> List[AnyStr]: ...
def readlines(self, sizehint: int | None = ...) -> list[AnyStr]: ...
def __iter__(self) -> Iterator[AnyStr]: ...
def tell(self) -> int: ...
def seek(self, offset: int, whence: int = ...) -> None: ...
def close(self) -> None: ...
def __enter__(self) -> _ProxyFile[AnyStr]: ...
def __exit__(self, exc_type: Type[BaseException] | None, exc: BaseException | None, tb: TracebackType | None) -> None: ...
def __exit__(self, exc_type: type[BaseException] | None, exc: BaseException | None, tb: TracebackType | None) -> None: ...
def readable(self) -> bool: ...
def writable(self) -> bool: ...
def seekable(self) -> bool: ...