Skip to content

Add magic trailing comma option #1876

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

Merged
timothycrosley merged 3 commits into from
May 13, 2022
Merged

Add magic trailing comma option #1876

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8cde8b2
Add magic trailing comma option
legau Dec 29, 2021
58685a4
Merge branch 'PyCQA:main' into trailing_comma
legau Mar 12, 2022
798ea22
Merge branch 'main' into trailing_comma
timothycrosley May 11, 2022
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
Merge branch 'main' into trailing_comma
  • Loading branch information
@timothycrosley
timothycrosley authored May 11, 2022
commit 798ea224eeee2e740882920822c74a0aa9e25458
18 changes: 18 additions & 0 deletions tests/unit/test_isort.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5578,3 +5578,21 @@ def test_split_on_trailing_comma() -> None:

output = isort.code(expected_output, split_on_trailing_comma=True)
assert output == expected_output


def test_infinite_loop_in_unmatched_parenthesis() -> None:
test_input = "from os import ("

# ensure a syntax error is raised for unmatched parenthesis
with pytest.raises(ExistingSyntaxErrors):
isort.code(test_input)

test_input = """from os import (
path,

walk
)
"""

# ensure other cases are handled correctly
assert isort.code(test_input) == "from os import path, walk\n"
You are viewing a condensed version of this merge commit. You can view the full changes here.