Skip to content

Commit

Permalink
fix all b904s (#2501)
Browse files Browse the repository at this point in the history
  • Loading branch information
zsol committed Sep 18, 2021
1 parent 911470a commit 22747a6
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 15 deletions.
19 changes: 10 additions & 9 deletions src/black/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ def read_pyproject_toml(
except (OSError, ValueError) as e:
raise click.FileError(
filename=value, hint=f"Error reading configuration file: {e}"
)
) from None

if not config:
return None
Expand Down Expand Up @@ -172,7 +172,7 @@ def validate_regex(
try:
return re_compile_maybe_verbose(value) if value is not None else None
except re.error:
raise click.BadParameter("Not a valid regular expression")
raise click.BadParameter("Not a valid regular expression") from None


@click.command(context_settings=dict(help_option_names=["-h", "--help"]))
Expand Down Expand Up @@ -777,7 +777,9 @@ def format_file_in_place(
except NothingChanged:
return False
except JSONDecodeError:
raise ValueError(f"File '{src}' cannot be parsed as valid Jupyter notebook.")
raise ValueError(
f"File '{src}' cannot be parsed as valid Jupyter notebook."
) from None

if write_back == WriteBack.YES:
with open(src, "w", encoding=encoding, newline=newline) as f:
Expand Down Expand Up @@ -947,7 +949,7 @@ def format_cell(src: str, *, fast: bool, mode: Mode) -> str:
try:
masked_src, replacements = mask_cell(src_without_trailing_semicolon)
except SyntaxError:
raise NothingChanged
raise NothingChanged from None
masked_dst = format_str(masked_src, mode=mode)
if not fast:
check_stability_and_equivalence(masked_src, masked_dst, mode=mode)
Expand All @@ -957,7 +959,7 @@ def format_cell(src: str, *, fast: bool, mode: Mode) -> str:
)
dst = dst.rstrip("\n")
if dst == src:
raise NothingChanged
raise NothingChanged from None
return dst


Expand All @@ -970,7 +972,7 @@ def validate_metadata(nb: MutableMapping[str, Any]) -> None:
"""
language = nb.get("metadata", {}).get("language_info", {}).get("name", None)
if language is not None and language != "python":
raise NothingChanged
raise NothingChanged from None


def format_ipynb_string(src_contents: str, *, fast: bool, mode: Mode) -> FileContent:
Expand Down Expand Up @@ -1202,9 +1204,8 @@ def assert_equivalent(src: str, dst: str, *, pass_num: int = 1) -> None:
src_ast = parse_ast(src)
except Exception as exc:
raise AssertionError(
"cannot use --safe with this file; failed to parse source file. AST"
f" error message: {exc}"
)
"cannot use --safe with this file; failed to parse source file."
) from exc

try:
dst_ast = parse_ast(dst)
Expand Down
10 changes: 5 additions & 5 deletions src/black/linegen.py
Original file line number Diff line number Diff line change
Expand Up @@ -503,22 +503,22 @@ def right_hand_split(
yield from right_hand_split(line, line_length, features=features, omit=omit)
return

except CannotSplit:
except CannotSplit as e:
if not (
can_be_split(body)
or is_line_short_enough(body, line_length=line_length)
):
raise CannotSplit(
"Splitting failed, body is still too long and can't be split."
)
) from e

elif head.contains_multiline_strings() or tail.contains_multiline_strings():
raise CannotSplit(
"The current optional pair of parentheses is bound to fail to"
" satisfy the splitting algorithm because the head or the tail"
" contains multiline strings which by definition never fit one"
" line."
)
) from e

ensure_visible(opening_bracket)
ensure_visible(closing_bracket)
Expand Down Expand Up @@ -635,13 +635,13 @@ def delimiter_split(line: Line, features: Collection[Feature] = ()) -> Iterator[
try:
last_leaf = line.leaves[-1]
except IndexError:
raise CannotSplit("Line empty")
raise CannotSplit("Line empty") from None

bt = line.bracket_tracker
try:
delimiter_priority = bt.max_delimiter_priority(exclude={id(last_leaf)})
except ValueError:
raise CannotSplit("No delimiters found")
raise CannotSplit("No delimiters found") from None

if delimiter_priority == DOT_PRIORITY:
if bt.delimiter_count_with_priority(delimiter_priority) == 1:
Expand Down
2 changes: 1 addition & 1 deletion src/blackd/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ def parse_python_variant_header(value: str) -> Tuple[bool, Set[black.TargetVersi
raise InvalidVariantHeader(f"3.{minor} is not supported")
versions.add(black.TargetVersion[version_str])
except (KeyError, ValueError):
raise InvalidVariantHeader("expected e.g. '3.7', 'py3.5'")
raise InvalidVariantHeader("expected e.g. '3.7', 'py3.5'") from None
return False, versions


Expand Down

0 comments on commit 22747a6

Please sign in to comment.