fix all b904s (#2501)

This commit is contained in:
Zsolt Dollenstein 2021-09-18 22:18:06 +01:00 committed by GitHub
parent 911470a610
commit 22747a6937
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 15 deletions

View File

@ -114,7 +114,7 @@ def read_pyproject_toml(
except (OSError, ValueError) as e: except (OSError, ValueError) as e:
raise click.FileError( raise click.FileError(
filename=value, hint=f"Error reading configuration file: {e}" filename=value, hint=f"Error reading configuration file: {e}"
) ) from None
if not config: if not config:
return None return None
@ -172,7 +172,7 @@ def validate_regex(
try: try:
return re_compile_maybe_verbose(value) if value is not None else None return re_compile_maybe_verbose(value) if value is not None else None
except re.error: 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"])) @click.command(context_settings=dict(help_option_names=["-h", "--help"]))
@ -777,7 +777,9 @@ def format_file_in_place(
except NothingChanged: except NothingChanged:
return False return False
except JSONDecodeError: 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: if write_back == WriteBack.YES:
with open(src, "w", encoding=encoding, newline=newline) as f: with open(src, "w", encoding=encoding, newline=newline) as f:
@ -947,7 +949,7 @@ def format_cell(src: str, *, fast: bool, mode: Mode) -> str:
try: try:
masked_src, replacements = mask_cell(src_without_trailing_semicolon) masked_src, replacements = mask_cell(src_without_trailing_semicolon)
except SyntaxError: except SyntaxError:
raise NothingChanged raise NothingChanged from None
masked_dst = format_str(masked_src, mode=mode) masked_dst = format_str(masked_src, mode=mode)
if not fast: if not fast:
check_stability_and_equivalence(masked_src, masked_dst, mode=mode) check_stability_and_equivalence(masked_src, masked_dst, mode=mode)
@ -957,7 +959,7 @@ def format_cell(src: str, *, fast: bool, mode: Mode) -> str:
) )
dst = dst.rstrip("\n") dst = dst.rstrip("\n")
if dst == src: if dst == src:
raise NothingChanged raise NothingChanged from None
return dst return dst
@ -970,7 +972,7 @@ def validate_metadata(nb: MutableMapping[str, Any]) -> None:
""" """
language = nb.get("metadata", {}).get("language_info", {}).get("name", None) language = nb.get("metadata", {}).get("language_info", {}).get("name", None)
if language is not None and language != "python": 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: def format_ipynb_string(src_contents: str, *, fast: bool, mode: Mode) -> FileContent:
@ -1202,9 +1204,8 @@ def assert_equivalent(src: str, dst: str, *, pass_num: int = 1) -> None:
src_ast = parse_ast(src) src_ast = parse_ast(src)
except Exception as exc: except Exception as exc:
raise AssertionError( raise AssertionError(
"cannot use --safe with this file; failed to parse source file. AST" "cannot use --safe with this file; failed to parse source file."
f" error message: {exc}" ) from exc
)
try: try:
dst_ast = parse_ast(dst) dst_ast = parse_ast(dst)

View File

@ -503,14 +503,14 @@ def right_hand_split(
yield from right_hand_split(line, line_length, features=features, omit=omit) yield from right_hand_split(line, line_length, features=features, omit=omit)
return return
except CannotSplit: except CannotSplit as e:
if not ( if not (
can_be_split(body) can_be_split(body)
or is_line_short_enough(body, line_length=line_length) or is_line_short_enough(body, line_length=line_length)
): ):
raise CannotSplit( raise CannotSplit(
"Splitting failed, body is still too long and can't be split." "Splitting failed, body is still too long and can't be split."
) ) from e
elif head.contains_multiline_strings() or tail.contains_multiline_strings(): elif head.contains_multiline_strings() or tail.contains_multiline_strings():
raise CannotSplit( raise CannotSplit(
@ -518,7 +518,7 @@ def right_hand_split(
" satisfy the splitting algorithm because the head or the tail" " satisfy the splitting algorithm because the head or the tail"
" contains multiline strings which by definition never fit one" " contains multiline strings which by definition never fit one"
" line." " line."
) ) from e
ensure_visible(opening_bracket) ensure_visible(opening_bracket)
ensure_visible(closing_bracket) ensure_visible(closing_bracket)
@ -635,13 +635,13 @@ def delimiter_split(line: Line, features: Collection[Feature] = ()) -> Iterator[
try: try:
last_leaf = line.leaves[-1] last_leaf = line.leaves[-1]
except IndexError: except IndexError:
raise CannotSplit("Line empty") raise CannotSplit("Line empty") from None
bt = line.bracket_tracker bt = line.bracket_tracker
try: try:
delimiter_priority = bt.max_delimiter_priority(exclude={id(last_leaf)}) delimiter_priority = bt.max_delimiter_priority(exclude={id(last_leaf)})
except ValueError: except ValueError:
raise CannotSplit("No delimiters found") raise CannotSplit("No delimiters found") from None
if delimiter_priority == DOT_PRIORITY: if delimiter_priority == DOT_PRIORITY:
if bt.delimiter_count_with_priority(delimiter_priority) == 1: if bt.delimiter_count_with_priority(delimiter_priority) == 1:

View File

@ -195,7 +195,7 @@ def parse_python_variant_header(value: str) -> Tuple[bool, Set[black.TargetVersi
raise InvalidVariantHeader(f"3.{minor} is not supported") raise InvalidVariantHeader(f"3.{minor} is not supported")
versions.add(black.TargetVersion[version_str]) versions.add(black.TargetVersion[version_str])
except (KeyError, ValueError): 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 return False, versions