Skip to content

Commit

Permalink
remove all type: ignores in src/black
Browse files Browse the repository at this point in the history
  • Loading branch information
MarcoGorelli committed Dec 21, 2021
1 parent c758126 commit bb098c9
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 10 deletions.
3 changes: 2 additions & 1 deletion src/black/linegen.py
Original file line number Diff line number Diff line change
Expand Up @@ -815,9 +815,10 @@ def normalize_invisible_parens(node: Node, parens_after: Set[str]) -> None:
# "import from" nodes store parentheses directly as part of
# the statement
if is_lpar_token(child):
assert is_rpar_token(node.children[-1])
# make parentheses invisible
child.value = ""
node.children[-1].value = "" # type: ignore
node.children[-1].value = ""
elif child.type != token.STAR:
# insert invisible parentheses
node.insert_child(index, Leaf(token.LPAR, ""))
Expand Down
24 changes: 15 additions & 9 deletions src/black/parsing.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import ast
import platform
import sys
from typing import Any, Iterable, Iterator, List, Set, Tuple, Type, Union
from typing import Any, AnyStr, Iterable, Iterator, List, Set, Tuple, Type, Union

if sys.version_info < (3, 8):
from typing_extensions import Final
Expand Down Expand Up @@ -191,6 +191,16 @@ def parse_ast(src: str) -> Union[ast.AST, ast3.AST, ast27.AST]:
ast27_AST: Final[Type[ast27.AST]] = ast27.AST


def _normalize(lineend: AnyStr, value: AnyStr) -> AnyStr:
# To normalize, we strip any leading and trailing space from
# each line...
stripped: List[AnyStr] = [i.strip() for i in value.splitlines()]
normalized = lineend.join(stripped)
# ...and remove any blank lines at the beginning and end of
# the whole string
return normalized.strip()


def stringify_ast(
node: Union[ast.AST, ast3.AST, ast27.AST], depth: int = 0
) -> Iterator[str]:
Expand Down Expand Up @@ -254,14 +264,10 @@ def stringify_ast(
and field == "value"
and isinstance(value, (str, bytes))
):
lineend = "\n" if isinstance(value, str) else b"\n"
# To normalize, we strip any leading and trailing space from
# each line...
stripped = [line.strip() for line in value.splitlines()]
normalized = lineend.join(stripped) # type: ignore[attr-defined]
# ...and remove any blank lines at the beginning and end of
# the whole string
normalized = normalized.strip()
if isinstance(value, str):
normalized: Union[str, bytes] = _normalize("\n", value)
else:
normalized = _normalize(b"\n", value)
else:
normalized = value
yield f"{' ' * (depth+2)}{normalized!r}, # {value.__class__.__name__}"
Expand Down

0 comments on commit bb098c9

Please sign in to comment.