actions/black
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up preview in __init__.py

Browse Source
This commit is contained in:
Jelle Zijlstra 2022-12-10 08:38:03 -08:00
parent f58f446640
commit 2caca042c0
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/black/__init__.py
View File

@ -917,9 +917,6 @@ def format_file_contents(src_contents: str, *, fast: bool, mode: Mode) -> FileCo
valid by calling :func:`assert_equivalent` and :func:`assert_stable` on it. valid by calling :func:`assert_equivalent` and :func:`assert_stable` on it.
`mode` is passed to :func:`format_str`. `mode` is passed to :func:`format_str`.
""" """
if not mode.preview and not src_contents.strip():
raise NothingChanged
if mode.is_ipynb: if mode.is_ipynb:
dst_contents = format_ipynb_string(src_contents, fast=fast, mode=mode) dst_contents = format_ipynb_string(src_contents, fast=fast, mode=mode)
else: else:
@ -1014,7 +1011,7 @@ def format_ipynb_string(src_contents: str, *, fast: bool, mode: Mode) -> FileCon
Operate cell-by-cell, only on code cells, only for Python notebooks. Operate cell-by-cell, only on code cells, only for Python notebooks.
If the ``.ipynb`` originally had a trailing newline, it'll be preserved. If the ``.ipynb`` originally had a trailing newline, it'll be preserved.
""" """
if mode.preview and not src_contents: if not src_contents:
raise NothingChanged raise NothingChanged
trailing_newline = src_contents[-1] == "\n" trailing_newline = src_contents[-1] == "\n"
@ -1109,7 +1106,7 @@ def _format_str_once(src_contents: str, *, mode: Mode) -> str:
dst_contents = [] dst_contents = []
for block in dst_blocks: for block in dst_blocks:
dst_contents.extend(block.all_lines()) dst_contents.extend(block.all_lines())
if mode.preview and not dst_contents: if not dst_contents:
# Use decode_bytes to retrieve the correct source newline (CRLF or LF), # Use decode_bytes to retrieve the correct source newline (CRLF or LF),
# and check if normalized_content has more than one line # and check if normalized_content has more than one line
normalized_content, _, newline = decode_bytes(src_contents.encode("utf-8")) normalized_content, _, newline = decode_bytes(src_contents.encode("utf-8"))