Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix several mypy errors when run on the 3.11 stdlib #7389

Merged
merged 2 commits into from
Feb 27, 2022
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
2 changes: 1 addition & 1 deletion stdlib/asyncio/base_events.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ class BaseEventLoop(AbstractEventLoop):
self, protocol_factory: Callable[[], _ProtocolT], sock: socket, *, ssl: _SSLContext = ...
) -> tuple[BaseTransport, _ProtocolT]: ...
if sys.version_info >= (3, 11):
async def create_datagram_endpoint(
async def create_datagram_endpoint( # type: ignore[override]
self,
protocol_factory: Callable[[], _ProtocolT],
local_addr: tuple[str, int] | None = ...,
Expand Down
2 changes: 1 addition & 1 deletion stdlib/builtins.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -1710,7 +1710,7 @@ if sys.version_info >= (3, 10):
class EncodingWarning(Warning): ...

if sys.version_info >= (3, 11):
_SplitCondition = type[BaseException] | tuple[type[BaseException], ...] | Callable[[BaseException], bool]
_SplitCondition = Union[type[BaseException], tuple[type[BaseException], ...], Callable[[BaseException], bool]]

class BaseExceptionGroup(BaseException):
def __new__(cls: type[Self], __message: str, __exceptions: Sequence[BaseException]) -> Self: ...
Expand Down
73 changes: 27 additions & 46 deletions stdlib/enum.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -136,17 +136,19 @@ if sys.version_info >= (3, 11):
# In 3.11 `EnumMeta` metaclass is renamed to `EnumType`, but old name also exists.
EnumType = EnumMeta

class property(types.DynamicClassAttribute):
def __set_name__(self, ownerclass: type[Enum], name: str) -> None: ...
name: str
clsname: str
_magic_enum_attr = property
else:
_magic_enum_attr = types.DynamicClassAttribute

class Enum(metaclass=EnumMeta):
if sys.version_info >= (3, 11):
@property
def name(self) -> str: ...
@property
def value(self) -> Any: ...
else:
@types.DynamicClassAttribute
def name(self) -> str: ...
@types.DynamicClassAttribute
def value(self) -> Any: ...
@_magic_enum_attr
def name(self) -> str: ...
@_magic_enum_attr
def value(self) -> Any: ...
_name_: str
_value_: Any
if sys.version_info >= (3, 7):
Expand All @@ -165,20 +167,15 @@ class Enum(metaclass=EnumMeta):

if sys.version_info >= (3, 11):
class ReprEnum(Enum): ...

if sys.version_info >= (3, 11):
class IntEnum(int, ReprEnum):
_value_: int
@property
def value(self) -> int: ...
def __new__(cls: type[Self], value: int) -> Self: ...

_IntEnumBase = ReprEnum
else:
class IntEnum(int, Enum):
_value_: int
@types.DynamicClassAttribute
def value(self) -> int: ...
def __new__(cls: type[Self], value: int) -> Self: ...
_IntEnumBase = Enum

class IntEnum(int, _IntEnumBase):
_value_: int
@_magic_enum_attr
def value(self) -> int: ...
def __new__(cls: type[Self], value: int) -> Self: ...

def unique(enumeration: _EnumerationT) -> _EnumerationT: ...

Expand All @@ -187,29 +184,17 @@ _auto_null: Any
# subclassing IntFlag so it picks up all implemented base functions, best modeling behavior of enum.auto()
class auto(IntFlag):
_value_: Any
if sys.version_info >= (3, 11):
@property
def value(self) -> Any: ...
else:
@types.DynamicClassAttribute
def value(self) -> Any: ...

@_magic_enum_attr
def value(self) -> Any: ...
def __new__(cls: type[Self]) -> Self: ...

class Flag(Enum):
_name_: str | None # type: ignore[assignment]
_value_: int
if sys.version_info >= (3, 11):
@property
def name(self) -> str | None: ... # type: ignore[override]
@property
def value(self) -> int: ...
else:
@types.DynamicClassAttribute
def name(self) -> str | None: ... # type: ignore[override]
@types.DynamicClassAttribute
def value(self) -> int: ...

@_magic_enum_attr
def name(self) -> str | None: ... # type: ignore[override]
@_magic_enum_attr
def value(self) -> int: ...
def __contains__(self: Self, other: Self) -> bool: ...
def __bool__(self) -> bool: ...
def __or__(self: Self, other: Self) -> Self: ...
Expand All @@ -230,7 +215,7 @@ if sys.version_info >= (3, 11):
class StrEnum(str, ReprEnum):
def __new__(cls: type[Self], value: str) -> Self: ...
_value_: str
@property
@_magic_enum_attr
def value(self) -> str: ...

class EnumCheck(StrEnum):
Expand All @@ -255,10 +240,6 @@ if sys.version_info >= (3, 11):
EJECT = FlagBoundary.EJECT
KEEP = FlagBoundary.KEEP

class property(types.DynamicClassAttribute):
def __set_name__(self, ownerclass: type[Enum], name: str) -> None: ...
name: str
clsname: str
def global_str(self: Enum) -> str: ...
def global_enum(cls: _EnumerationT, update_str: bool = ...) -> _EnumerationT: ...
def global_enum_repr(self: Enum) -> str: ...
Expand Down