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

Clean up typing ignores, fix build

Browse Source
This commit is contained in:
Łukasz Langa 2018-03-15 23:26:56 -07:00
parent c87b33c4d5
commit 907dc6c35e
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
black.py
View File

@ -347,8 +347,8 @@ def mark(self, leaf: Leaf) -> None:
if leaf.type in CLOSING_BRACKETS: if leaf.type in CLOSING_BRACKETS:
self.depth -= 1 self.depth -= 1
opening_bracket = self.bracket_match.pop((self.depth, leaf.type)) opening_bracket = self.bracket_match.pop((self.depth, leaf.type))
leaf.opening_bracket = opening_bracket # type: ignore leaf.opening_bracket = opening_bracket
leaf.bracket_depth = self.depth # type: ignore leaf.bracket_depth = self.depth
if self.depth == 0: if self.depth == 0:
delim = is_delimiter(leaf) delim = is_delimiter(leaf)
if delim: if delim:
@ -491,9 +491,9 @@ def maybe_remove_trailing_comma(self, closing: Leaf) -> bool:
# For parens let's check if it's safe to remove the comma. If the # For parens let's check if it's safe to remove the comma. If the
# trailing one is the only one, we might mistakenly change a tuple # trailing one is the only one, we might mistakenly change a tuple
# into a different type by removing the comma. # into a different type by removing the comma.
depth = closing.bracket_depth + 1 # type: ignore depth = closing.bracket_depth + 1
commas = 0 commas = 0
opening = closing.opening_bracket # type: ignore opening = closing.opening_bracket
for _opening_index, leaf in enumerate(self.leaves): for _opening_index, leaf in enumerate(self.leaves):
if leaf is opening: if leaf is opening:
break break
@ -505,7 +505,7 @@ def maybe_remove_trailing_comma(self, closing: Leaf) -> bool:
if leaf is closing: if leaf is closing:
break break
bracket_depth = leaf.bracket_depth # type: ignore bracket_depth = leaf.bracket_depth
if bracket_depth == depth and leaf.type == token.COMMA: if bracket_depth == depth and leaf.type == token.COMMA:
commas += 1 commas += 1
if commas > 1: if commas > 1:
@ -1180,7 +1180,7 @@ def left_hand_split(line: Line, py36: bool = False) -> Iterator[Line]:
if ( if (
current_leaves is body_leaves and current_leaves is body_leaves and
leaf.type in CLOSING_BRACKETS and leaf.type in CLOSING_BRACKETS and
leaf.opening_bracket is matching_bracket # type: ignore leaf.opening_bracket is matching_bracket
): ):
current_leaves = tail_leaves current_leaves = tail_leaves
current_leaves.append(leaf) current_leaves.append(leaf)
@ -1234,7 +1234,7 @@ def right_hand_split(line: Line, py36: bool = False) -> Iterator[Line]:
current_leaves.append(leaf) current_leaves.append(leaf)
if current_leaves is tail_leaves: if current_leaves is tail_leaves:
if leaf.type in CLOSING_BRACKETS: if leaf.type in CLOSING_BRACKETS:
opening_bracket = leaf.opening_bracket # type: ignore opening_bracket = leaf.opening_bracket
current_leaves = body_leaves current_leaves = body_leaves
tail_leaves.reverse() tail_leaves.reverse()
body_leaves.reverse() body_leaves.reverse()
@ -1296,7 +1296,7 @@ def delimiter_split(line: Line, py36: bool = False) -> Iterator[Line]:
current_line.append(comment_after, preformatted=True) current_line.append(comment_after, preformatted=True)
lowest_depth = min(lowest_depth, leaf.bracket_depth) lowest_depth = min(lowest_depth, leaf.bracket_depth)
if ( if (
leaf.bracket_depth == lowest_depth and # type: ignore leaf.bracket_depth == lowest_depth and
leaf.type == token.STAR or leaf.type == token.STAR or
leaf.type == token.DOUBLESTAR leaf.type == token.DOUBLESTAR
): ):
@ -1355,8 +1355,8 @@ def is_python36(node: Node) -> bool:
""" """
for n in node.pre_order(): for n in node.pre_order():
if n.type == token.STRING: if n.type == token.STRING:
assert isinstance(n, Leaf) value_head = n.value[:2] # type: ignore
if n.value[:2] in {'f"', 'F"', "f'", "F'", 'rf', 'fr', 'RF', 'FR'}: if value_head in {'f"', 'F"', "f'", "F'", 'rf', 'fr', 'RF', 'FR'}:
return True return True
elif ( elif (

3
blib2to3/pytree.pyi
View File

@ -56,6 +56,9 @@ class Leaf(Base):
value: Text value: Text
fixers_applied: List[Any] fixers_applied: List[Any]
def __init__(self, type: int, value: Text, context: Optional[_Context] = ..., prefix: Optional[Text] = ..., fixers_applied: List[Any] = ...) -> None: ... def __init__(self, type: int, value: Text, context: Optional[_Context] = ..., prefix: Optional[Text] = ..., fixers_applied: List[Any] = ...) -> None: ...
# bolted on attributes by Black
bracket_depth: int
opening_bracket: Leaf
def convert(gr: Grammar, raw_node: _RawNode) -> _NL: ... def convert(gr: Grammar, raw_node: _RawNode) -> _NL: ...