Fix enum `.value` with tuple #15637

A5rocks · 2023-07-11T08:02:24Z

This makes .value not accidentally prune out one of its literals!

Alternatively (I just realized this now) we could just return the type without .last_known_value. I can switch to that if that's better. Anyways, I suspect this initial approach might be unpopular with mypy primer anyways!

Noticed this while looking at #14092!

Fixes #12523 (though this PR doesn't intend to do that...)

A5rocks · 2023-07-11T08:23:25Z

Yeah... As expected.

A5rocks · 2023-07-12T04:37:34Z

test-data/unit/check-final.test

-C().x = 4  # E: Cannot assign to final attribute "x"
+C().x = 4  # E: Cannot assign to final attribute "x" \
+           # E: Incompatible types in assignment (expression has type "Literal[4]", variable has type "Literal[1]")
+# TODO: this missing error is a sign of a bug!!


I also wrote up #15640 while doing this (obviously).

I still need to make a minimized issue for this TODO.

for more information, see https://pre-commit.ci

mypy/messages.py

A5rocks · 2023-07-18T06:36:45Z

Turns out the error reporting fix I added fixes #12523!

for more information, see https://pre-commit.ci

A5rocks · 2023-07-18T06:50:22Z

Going through mypy primer:

most of the changes are fine, just more error reporting which is probably nicer (?)
- this isn't always the case, but it's the case enough and I'm already using the best heuristic I can think of (i.e. whether both a literal and a non-literal are used)
steam.py gets an error because it tries to conditionally assign a final different values
- I think this is expected.
pip and poetry get weird new inference errors
- this is an existing problem I believe, I don't think this PR caused these. I can't think of how they're caused by anything I touched, other than comparing literals revealing these. last_known_value is probably forgotten somewhere?
- I'm going to leave these alone for another PR (I may be horrible at scoping but even I'm not this bad), both of these can probably be fixed with just an explicit type

tl;dr all seems fine

github-actions · 2023-07-18T07:48:23Z

Diff from mypy_primer, showing the effect of this PR on open source code:

steam.py (https://github.com/Gobot1234/steam.py)
+ steam/_const.py:112: error: Incompatible types in assignment (expression has type "Literal['lxml-xml']", variable has type "Literal['html.parser']")  [assignment]
- steam/trade.py:194: error: Incompatible types in assignment (expression has type "tuple[str, str, str, str, str, str, str]", base class "Asset" defined the type as "tuple[str, str, str, str, str, str]")  [assignment]
+ steam/trade.py:194: error: Incompatible types in assignment (expression has type "tuple[Literal['name'], builtins.str, builtins.str, builtins.str, builtins.str, builtins.str, builtins.str]", base class "Asset" defined the type as "tuple[builtins.str, builtins.str, builtins.str, builtins.str, builtins.str, builtins.str]")  [assignment]

poetry (https://github.com/python-poetry/poetry)
+ tests/puzzle/test_solver.py:3463: error: Dict entry 0 has incompatible type "str": "Literal['0.1.0']"; expected "str": "Literal['repo'] | None"  [dict-item]
+ tests/puzzle/test_solver.py:3464: error: Dict entry 1 has incompatible type "str": "Literal["sys_platform == 'darwin'"]"; expected "str": "Literal['repo'] | None"  [dict-item]

comtypes (https://github.com/enthought/comtypes)
- comtypes/typeinfo.py:858: error: List item 0 has incompatible type "tuple[str, Module]"; expected "tuple[str, type[_CData]] | tuple[str, type[_CData], int]"  [list-item]
+ comtypes/typeinfo.py:858: error: List item 0 has incompatible type "tuple[Literal['guid'], Module]"; expected "tuple[builtins.str, type[_CData]] | tuple[builtins.str, type[_CData], int]"  [list-item]
- comtypes/typeinfo.py:891: error: List item 0 has incompatible type "tuple[str, Module]"; expected "tuple[str, type[_CData]] | tuple[str, type[_CData], int]"  [list-item]
+ comtypes/typeinfo.py:891: error: List item 0 has incompatible type "tuple[Literal['guid'], Module]"; expected "tuple[builtins.str, type[_CData]] | tuple[builtins.str, type[_CData], int]"  [list-item]

dragonchain (https://github.com/dragonchain/dragonchain)
- dragonchain/lib/database/redis_utest.py:217:35: error: Argument 2 to "zadd_sync" has incompatible type "str"; expected "Dict[str, int]"  [arg-type]
+ dragonchain/lib/database/redis_utest.py:217:35: error: Argument 2 to "zadd_sync" has incompatible type "Literal['banana']"; expected "Dict[builtins.str, int]"  [arg-type]

pip (https://github.com/pypa/pip)
+ src/pip/_internal/utils/deprecation.py:88: error: List item 1 has incompatible type "tuple[builtins.str | None, Literal['pip {} will enforce this behaviour change.'] | Literal['Since pip {}, this is no longer supported.']]"; expected "tuple[int | builtins.str | None, Literal['Discussion can be found at https://github.com/pypa/pip/issues/{}'] | Literal['You can use the flag --use-feature={} to test the upcoming behaviour.'] | None]"  [list-item]
+ src/pip/_internal/utils/deprecation.py:94: error: List item 2 has incompatible type "tuple[builtins.str | None, Literal['A possible replacement is {}.']]"; expected "tuple[int | builtins.str | None, Literal['Discussion can be found at https://github.com/pypa/pip/issues/{}'] | Literal['You can use the flag --use-feature={} to test the upcoming behaviour.'] | None]"  [list-item]

prefect (https://github.com/PrefectHQ/prefect)
- src/prefect/server/database/configurations.py:234: error: Incompatible types in assignment (expression has type "str", target has type "dict[str, float | Any]")  [assignment]
+ src/prefect/server/database/configurations.py:234: error: Incompatible types in assignment (expression has type "Literal['named']", target has type "dict[builtins.str, float | Any]")  [assignment]
- src/prefect/server/database/query_components.py:213: error: Argument 2 to "where" of "Select" has incompatible type "Any | bool"; expected "ColumnElement[bool] | _HasClauseElement | SQLCoreOperations[bool] | ExpressionElementRole[bool] | Callable[[], ColumnElement[bool]] | LambdaElement"  [arg-type]
+ src/prefect/server/database/query_components.py:213: error: Argument 2 to "where" of "Select" has incompatible type "Any | Literal[True]"; expected "ColumnElement[builtins.bool] | _HasClauseElement | SQLCoreOperations[builtins.bool] | ExpressionElementRole[builtins.bool] | Callable[[], ColumnElement[builtins.bool]] | LambdaElement"  [arg-type]
- src/prefect/testing/utilities.py:186: error: Argument "sort" to "read_flow_runs" of "PrefectClient" has incompatible type "prefect.server.schemas.sorting.FlowRunSort"; expected "prefect.client.schemas.sorting.FlowRunSort"  [arg-type]
+ src/prefect/testing/utilities.py:186: error: Argument "sort" to "read_flow_runs" of "PrefectClient" has incompatible type "Literal[FlowRunSort.EXPECTED_START_TIME_ASC]"; expected "prefect.client.schemas.sorting.FlowRunSort"  [arg-type]

scikit-learn (https://github.com/scikit-learn/scikit-learn)
- sklearn/svm/tests/test_svm.py:596: error: List item 1 has incompatible type "tuple[type[NuSVC], str]"; expected "tuple[type[BaseSVC], str]"  [list-item]
+ sklearn/svm/tests/test_svm.py:596: error: List item 1 has incompatible type "tuple[type[NuSVC], Literal['specified nu is infeasible']]"; expected "tuple[type[BaseSVC], builtins.str]"  [list-item]
- sklearn/ensemble/tests/test_stacking.py:552: error: List item 1 has incompatible type "tuple[type[StackingRegressor], type[DummyRegressor], str, LinearRegression, Any, Any]"; expected "tuple[ABCMeta, type[BaseEstimator], str, BaseEstimator, Any, Any]"  [list-item]
+ sklearn/ensemble/tests/test_stacking.py:552: error: List item 1 has incompatible type "tuple[type[StackingRegressor], type[DummyRegressor], Literal['predict'], LinearRegression, Any, Any]"; expected "tuple[ABCMeta, type[BaseEstimator], builtins.str, BaseEstimator, Any, Any]"  [list-item]

apprise (https://github.com/caronc/apprise)
- apprise/plugins/NotifyMisskey.py:117: error: Incompatible types in assignment (expression has type "tuple[str, str]", variable has type "tuple[str]")  [assignment]
+ apprise/plugins/NotifyMisskey.py:117: error: Incompatible types in assignment (expression has type "tuple[Literal['{schema}://{token}@{host}'], Literal['{schema}://{token}@{host}:{port}']]", variable has type "tuple[builtins.str]")  [assignment]

streamlit (https://github.com/streamlit/streamlit)
- lib/tests/streamlit/elements/time_widgets_test.py:49:59: error: Argument "step" has incompatible type "Tuple[int, int]"; expected "Union[int, timedelta]"  [arg-type]
+ lib/tests/streamlit/elements/time_widgets_test.py:49:59: error: Argument "step" has incompatible type "Tuple[Literal[90], Literal[0]]"; expected "Union[builtins.int, timedelta]"  [arg-type]

discord.py (https://github.com/Rapptz/discord.py)
- discord/scheduled_event.py:491: error: Incompatible types in assignment (expression has type "int | int | int | int", target has type "str")  [assignment]
+ discord/scheduled_event.py:491: error: Incompatible types in assignment (expression has type "Literal[1] | Literal[2] | Literal[3] | Literal[4]", target has type "str")  [assignment]
- discord/scheduled_event.py:510: error: Incompatible types in assignment (expression has type "int | int | int", target has type "str")  [assignment]
+ discord/scheduled_event.py:510: error: Incompatible types in assignment (expression has type "Literal[1] | Literal[2] | Literal[3]", target has type "str")  [assignment]
- discord/guild.py:3161: error: Incompatible types in assignment (expression has type "int | int | int", target has type "str")  [assignment]
+ discord/guild.py:3161: error: Incompatible types in assignment (expression has type "Literal[1] | Literal[2] | Literal[3]", target has type "str")  [assignment]
- discord/app_commands/transformers.py:139: error: Incompatible types in assignment (expression has type "list[int | int | int | int | int | int | int | int | int | int | int]", target has type "str | int")  [assignment]
+ discord/app_commands/transformers.py:139: error: Incompatible types in assignment (expression has type "list[Literal[0] | Literal[1] | Literal[2] | Literal[3] | Literal[4] | Literal[5] | Literal[10] | Literal[11] | Literal[12] | Literal[13] | Literal[15]]", target has type "str | builtins.int")  [assignment]

KotlinIsland · 2024-07-29T04:36:05Z

would really appreciate seeing this merged

A5rocks added 2 commits July 11, 2023 16:58

Check last_known_value when checking subtyping for instances

c7a5068

Add a small test for this

804d3f9

This comment has been minimized.

Sign in to view

A5rocks added 2 commits July 12, 2023 13:08

Fix issue with assigning -1 to an enum value

6e21975

Perhaps better error formatting regarding literals

b07acd7

A5rocks commented Jul 12, 2023

View reviewed changes

This comment has been minimized.

Sign in to view

A5rocks and others added 2 commits July 12, 2023 14:49

Update some more test case error messages

7932508

[pre-commit.ci] auto fixes from pre-commit.com hooks

85b98c6

for more information, see https://pre-commit.ci

This comment has been minimized.

Sign in to view

A5rocks added 2 commits July 12, 2023 16:54

Stop inferring Any for .value on a Enum element union

f7a14a3

Update a few more tests!!

e61ee45

This comment has been minimized.

Sign in to view

ikonst reviewed Jul 13, 2023

View reviewed changes

mypy/messages.py Outdated Show resolved Hide resolved

A5rocks and others added 3 commits July 18, 2023 15:42

Fix PR nitpick and 2 test cases

98def03

[pre-commit.ci] auto fixes from pre-commit.com hooks

1acbed6

for more information, see https://pre-commit.ci

Oops

4ffc00d

This comment has been minimized.

Sign in to view

Fix one more test case

41dabed

A5rocks requested a review from ikonst July 18, 2023 08:36

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix enum `.value` with tuple #15637

Fix enum `.value` with tuple #15637

A5rocks commented Jul 11, 2023 •

edited

Loading

This comment has been minimized.

A5rocks commented Jul 11, 2023

A5rocks Jul 12, 2023

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

A5rocks commented Jul 18, 2023

A5rocks commented Jul 18, 2023 •

edited

Loading

This comment has been minimized.

github-actions bot commented Jul 18, 2023

KotlinIsland commented Jul 29, 2024

Fix enum .value with tuple #15637

Are you sure you want to change the base?

Fix enum .value with tuple #15637

Conversation

A5rocks commented Jul 11, 2023 • edited Loading

This comment has been minimized.

A5rocks commented Jul 11, 2023

A5rocks Jul 12, 2023

Choose a reason for hiding this comment

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

A5rocks commented Jul 18, 2023

A5rocks commented Jul 18, 2023 • edited Loading

This comment has been minimized.

github-actions bot commented Jul 18, 2023

KotlinIsland commented Jul 29, 2024

Fix enum `.value` with tuple #15637

Fix enum `.value` with tuple #15637

A5rocks commented Jul 11, 2023 •

edited

Loading

A5rocks commented Jul 18, 2023 •

edited

Loading