Skip to content
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.

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

Accept empty stdin (close #2337) #2346

Merged
merged 6 commits into from Jun 23, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/black/__init__.py
Expand Up @@ -803,7 +803,8 @@ def format_stdin_to_stdout(
)
if write_back == WriteBack.YES:
# Make sure there's a newline after the content
dst += "" if dst[-1] == "\n" else "\n"
if dst and dst[-1] != "\n":
dst += "\n"
f.write(dst)
elif write_back in (WriteBack.DIFF, WriteBack.COLOR_DIFF):
now = datetime.utcnow()
Expand Down
13 changes: 13 additions & 0 deletions tests/test_black.py
Expand Up @@ -1679,6 +1679,19 @@ def test_reformat_one_with_stdin_and_existing_path(self) -> None:
# __BLACK_STDIN_FILENAME__ should have been stripped
report.done.assert_called_with(expected, black.Changed.YES)

def test_reformat_one_with_stdin_empty(self) -> None:
"""Check that black doesn't fail for empty stdin (issue/#2337)"""
This conversation was marked as resolved.
Show resolved Hide resolved
with patch("sys.stdout", open(os.devnull, "w")):
# Patch `sys.stdout` to null device lest
# `format_stdin_to_stdout` detaches stdout at the end and causes
# "ValueError: I/O operation on closed file" in subsequent tests
black.format_stdin_to_stdout(
This conversation was marked as resolved.
Show resolved Hide resolved
fast=True,
content="",
write_back=black.WriteBack.YES,
mode=DEFAULT_MODE,
)

def test_gitignore_exclude(self) -> None:
path = THIS_DIR / "data" / "include_exclude_tests"
include = re.compile(r"\.pyi?$")
Expand Down