Skip to content

[pyupgrade] Handle nested Optionals (UP045) #19770

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

Jump to bottom
Merged
merged 9 commits into from
Aug 19, 2025
Merged

[pyupgrade] Handle nested Optionals (UP045) #19770

merged 9 commits into from
Aug 19, 2025

Conversation

danparizher
Copy link
Contributor

Summary

Fixes #19746

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Aug 5, 2025 •
edited
Loading

ruff-ecosystem results

Linter (stable)

✅ ecosystem check detected no linter changes.

Linter (preview)

✅ ecosystem check detected no linter changes.

ntBre
ntBre reviewed Aug 6, 2025
View reviewed changes
Copy link
Contributor

@ntBre ntBre left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this fully solves the problem. You may also want to look at a related implementation in another rule:

ruff/crates/ruff_linter/src/rules/flake8_pyi/rules/duplicate_union_member.rs

Lines 98 to 103 in 6b9692c

// Traverse the union, collect all diagnostic members
if is_optional_as_none_in_union_enabled(checker.settings()) {
traverse_union_and_optional(&mut check_for_duplicate_members, checker.semantic(), expr);
} else {
traverse_union(&mut check_for_duplicate_members, checker.semantic(), expr);
}

@danparizher danparizher requested a review from ntBre August 7, 2025 23:18
ntBre
ntBre reviewed Aug 14, 2025
View reviewed changes
Copy link
Contributor

@ntBre ntBre left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, I think this is working well now. I just had a few small comments left. Could you fix the merge conflicts too? You probably just need to rerun the tests and accept the snapshots to pull in the new diagnostic format.

@ntBre ntBre added bug Something isn't working fixes Related to suggested fixes for violations labels Aug 14, 2025
@danparizher danparizher requested a review from ntBre August 15, 2025 19:55
ntBre
ntBre approved these changes Aug 19, 2025
View reviewed changes
Copy link
Contributor

@ntBre ntBre left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

I just pushed one tiny inlining and relocated the CLI test.

@ntBre ntBre changed the title [pyupgrade] Fix missing flatten_optional import in UP045 rule [pyupgrade] Handle nested Optionals (UP045) Aug 19, 2025
@ntBre ntBre merged commit e0f4cec into astral-sh:main Aug 19, 2025
35 checks passed
@danparizher danparizher deleted the fix-19746 branch August 19, 2025 22:48
@BrewTestBot BrewTestBot mentioned this pull request Aug 21, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ntBre ntBre ntBre approved these changes

Assignees
No one assigned
Labels
bug Something isn't working fixes Related to suggested fixes for violations
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

UP045 fixes Optional[Optional[x]] to x | None | None
2 participants
@danparizher @ntBre