diff --git a/mypy/nodes.py b/mypy/nodes.py index 5e6fe73a293e..6487ee4b745c 100644 --- a/mypy/nodes.py +++ b/mypy/nodes.py @@ -3247,10 +3247,26 @@ def enum_members(self) -> list[str]: name for name, sym in self.names.items() if ( - isinstance(sym.node, Var) - and name not in EXCLUDED_ENUM_ATTRIBUTES - and not name.startswith("__") - and sym.node.has_explicit_value + ( + isinstance(sym.node, Var) + and name not in EXCLUDED_ENUM_ATTRIBUTES + and not name.startswith("__") + and sym.node.has_explicit_value + and not ( + isinstance( + typ := mypy.types.get_proper_type(sym.node.type), mypy.types.Instance + ) + and typ.type.fullname == "enum.nonmember" + ) + ) + or ( + isinstance(sym.node, Decorator) + and any( + dec.fullname == "enum.member" + for dec in sym.node.decorators + if isinstance(dec, RefExpr) + ) + ) ) ] diff --git a/mypy/typeops.py b/mypy/typeops.py index 1667e8431a17..ac0695a096a6 100644 --- a/mypy/typeops.py +++ b/mypy/typeops.py @@ -955,7 +955,7 @@ class Status(Enum): FAILURE = 2 UNKNOWN = 3 - ...and if we call `try_expanding_enum_to_union(Union[Color, Status], 'module.Color')`, + ...and if we call `try_expanding_sum_type_to_union(Union[Color, Status], 'module.Color')`, this function will return Literal[Color.RED, Color.BLUE, Color.YELLOW, Status]. """ typ = get_proper_type(typ) diff --git a/test-data/unit/check-enum.test b/test-data/unit/check-enum.test index 7b97f96f55b1..a3abf53e29ac 100644 --- a/test-data/unit/check-enum.test +++ b/test-data/unit/check-enum.test @@ -1933,6 +1933,18 @@ class D(C): # E: Cannot extend enum with existing members: "C" \ x: int # E: Cannot assign to final name "x" [builtins fixtures/bool.pyi] +[case testEnumNotFinalWithMethodsAndUninitializedValuesStubMember] +# flags: --python-version 3.11 +# This was added in 3.11 +import lib + +[file lib.pyi] +from enum import Enum, member +class A(Enum): + @member + def x(self) -> None: ... +[builtins fixtures/bool.pyi] + [case testEnumLiteralValues] from enum import Enum @@ -2325,6 +2337,28 @@ def some_a(a: A): [builtins fixtures/dict.pyi] +[case testEnumMemberAndNonMemberSupport] +# flags: --python-version 3.11 --warn-unreachable +# This was added in 3.11 +from enum import Enum, member, nonmember + +class A(Enum): + x = 1 + y = member(2) + z = nonmember(3) + +def some_a(a: A): + if a is not A.x and a is not A.z: + reveal_type(a) # N: Revealed type is "Literal[__main__.A.y]" + if a is not A.y and a is not A.z: + reveal_type(a) # N: Revealed type is "Literal[__main__.A.x]" + if a is not A.x: + reveal_type(a) # N: Revealed type is "Literal[__main__.A.y]" + if a is not A.y: + reveal_type(a) # N: Revealed type is "Literal[__main__.A.x]" +[builtins fixtures/dict.pyi] + + [case testErrorOnAnnotatedMember] from enum import Enum