Skip to content

Support narrowing literals and enums using the in operator in combination with list, set, and tuple expressions. #17044

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.

Sign up for GitHub

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

Open
tyralla wants to merge 21 commits into
base: master
Choose a base branch
from
Open

Support narrowing literals and enums using the in operator in combination with list, set, and tuple expressions. #17044

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
e83679f
Support narrowing literals and enums using the in operator in combina…
tyralla Mar 17, 2024
a0d1db3
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 17, 2024
2bff3c2
fix
tyralla Mar 17, 2024
5e8a525
Merge branch 'feature/narrow_using_in' of https://github.com/tyralla/…
tyralla Mar 17, 2024
2fa954a
Optional[Expression] -> Expression | None
tyralla Mar 17, 2024
db7b969
Add __eq__ to object in tuple.pyi
tyralla Mar 17, 2024
23bfd4e
simplification: avoid returning None
tyralla Mar 18, 2024
207c56e
replace the critical `in` comparisons for testing
tyralla Mar 19, 2024
dea2614
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 19, 2024
214f51a
Revert "[pre-commit.ci] auto fixes from pre-commit.com hooks"
tyralla Mar 19, 2024
a495fee
Revert "replace the critical `in` comparisons for testing"
tyralla Mar 19, 2024
8785fe9
fix mypyc crash
tyralla Mar 21, 2024
6af40ae
make NameExpr mypyc copyable
tyralla Mar 21, 2024
e52eb25
ignore star expressions
tyralla Mar 21, 2024
763c265
update docs
tyralla Mar 21, 2024
44d71eb
Also support list expressions.
tyralla Oct 26, 2024
bd145d1
Merge branch 'master' into feature/narrow_using_in
tyralla Oct 26, 2024
a04126d
Also support set expressions.
tyralla Oct 27, 2024
3e5bdf9
Merge branch 'master' into feature/narrow_using_in
tyralla May 23, 2025
78dbff2
Adjust the `testNarrowingOptionalEqualsNone` test case.
tyralla May 23, 2025
e445651
update comment
tyralla May 23, 2025
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
Prev Previous commit
Next Next commit
replace the critical in comparisons for testing
  • Loading branch information
@tyralla
tyralla committed Mar 19, 2024
commit 207c56eb3cd7732fbaa82e2f7e10736bf127a608
2 changes: 1 addition & 1 deletion mypy/checkexpr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3575,7 +3575,7 @@ def visit_comparison_expr(self, e: ComparisonExpr) -> Type:

# Only show dangerous overlap if there are no other errors. See
# testCustomEqCheckStrictEquality for an example.
if not w.has_new_errors() and operator in ("==", "!="):
if not w.has_new_errors() and (operator == "==" or operator == "!="):
right_type = self.accept(right)
if self.dangerous_comparison(left_type, right_type):
# Show the most specific literal types possible
Expand Down
2 changes: 1 addition & 1 deletion mypy/find_sources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ def find_sources_in_dir(self, path: str) -> list[BuildSource]:
names = sorted(self.fscache.listdir(path), key=keyfunc)
for name in names:
# Skip certain names altogether
if name in ("__pycache__", "site-packages", "node_modules") or name.startswith("."):
if (name == "__pycache__" or name == "site-packages" or name == "node_modules") or name.startswith("."):
continue
subpath = os.path.join(path, name)

Expand Down
4 changes: 2 additions & 2 deletions mypy/reachability.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,8 @@ def infer_condition_value(expr: Expression, options: Options) -> int:
name = expr.name
elif isinstance(expr, OpExpr) and expr.op in ("and", "or"):
left = infer_condition_value(expr.left, options)
if (left in (ALWAYS_TRUE, MYPY_TRUE) and expr.op == "and") or (
left in (ALWAYS_FALSE, MYPY_FALSE) and expr.op == "or"
if ((left == ALWAYS_TRUE or left == MYPY_TRUE) and expr.op == "and") or (
(left == ALWAYS_FALSE or left == MYPY_FALSE) and expr.op == "or"
):
# Either `True and <other>` or `False or <other>`: the result will
# always be the right-hand-side.
Expand Down
8 changes: 4 additions & 4 deletions mypy/semanal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5301,13 +5301,13 @@ def visit_op_expr(self, expr: OpExpr) -> None:

if expr.op in ("and", "or"):
inferred = infer_condition_value(expr.left, self.options)
if (inferred in (ALWAYS_FALSE, MYPY_FALSE) and expr.op == "and") or (
inferred in (ALWAYS_TRUE, MYPY_TRUE) and expr.op == "or"
if ((inferred == ALWAYS_FALSE or inferred == MYPY_FALSE) and expr.op == "and") or (
(inferred == ALWAYS_TRUE or inferred == MYPY_TRUE) and expr.op == "or"
):
expr.right_unreachable = True
return
elif (inferred in (ALWAYS_TRUE, MYPY_TRUE) and expr.op == "and") or (
inferred in (ALWAYS_FALSE, MYPY_FALSE) and expr.op == "or"
elif ((inferred == ALWAYS_TRUE or inferred == MYPY_TRUE) and expr.op == "and") or (
(inferred == ALWAYS_FALSE or inferred == MYPY_FALSE) and expr.op == "or"
):
expr.right_always = True

Expand Down