Keep nested parens around lambda/ternary comprehension iterables (preview)#5200
Open
sarathfrancis90 wants to merge 1 commit into
Open
Keep nested parens around lambda/ternary comprehension iterables (preview)#5200sarathfrancis90 wants to merge 1 commit into
sarathfrancis90 wants to merge 1 commit into
Conversation
…view) `wrap_comprehension_in` keeps the parentheses around a lambda or conditional expression used as a comprehension's iterable, otherwise the trailing `for`/`if` clauses get absorbed into it and the result is invalid. psf#5176 handled the single-paren case, but `maybe_make_parens_invisible_in_atom` recurses through the atom, so a redundantly nested pair like `[x for x in ((lambda: 0))]` still had *both* layers stripped, producing `[x for x in lambda: 0]` and crashing with an ASTSafetyError. Look through redundant nested parens before deciding whether the atom wraps a lambda or ternary, so at least one pair is kept.
sarathfrancis90
force-pushed
the
keep-nested-parens-lambda-comprehension
branch
from
e592afd to
00e1441
Compare
Collaborator
|
Thanks for this fix! Would it be non-trivial to continue stripping the outer parentheses, only leaving one pair always? If that'd be a lot of extra work, I'd be fine deferring that and merging the PR as-is, but I'd appreciate that change if possible. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
While poking at
wrap_comprehension_inafter #5176, I hit a case it doesn't cover. #5176 keeps the parens around a lambda or ternary used as a comprehension's iterable so the trailingfor/ifclauses aren't absorbed into it. But when those parens are redundantly nested, e.g.maybe_make_parens_invisible_in_atomrecurses and strips both pairs, leaving[x for x in lambda: 0]— invalid code, which crashes with anASTSafetyErrorat the default line length. Same for a nested ternary and for generator/dict/set comprehensions, and at deeper nesting.The guard only inspected the atom's direct child, so a paren-wrapped atom slipped past it. I made it look through the redundant nested parens before deciding whether the iterable is a lambda/ternary, so at least one pair is kept (matching what the stable style does with such input).
Added the nested lambda/ternary cases to the existing
preview_wrap_comprehension_infixture — they crashed before and pass now. The full test suite, mypy, flake8 and the self-format check are green.