Loading black.py +10 −10 Changes for black.py: 10 added lines, 10 removed lines. Original line number Diff line number Diff line Loading @@ -347,8 +347,8 @@ def mark(self, leaf: Leaf) -> None: if leaf.type in CLOSING_BRACKETS: self.depth -= 1 opening_bracket = self.bracket_match.pop((self.depth, leaf.type)) leaf.opening_bracket = opening_bracket # type: ignore leaf.bracket_depth = self.depth # type: ignore leaf.opening_bracket = opening_bracket leaf.bracket_depth = self.depth if self.depth == 0: delim = is_delimiter(leaf) if delim: Loading Loading @@ -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 # trailing one is the only one, we might mistakenly change a tuple # into a different type by removing the comma. depth = closing.bracket_depth + 1 # type: ignore depth = closing.bracket_depth + 1 commas = 0 opening = closing.opening_bracket # type: ignore opening = closing.opening_bracket for _opening_index, leaf in enumerate(self.leaves): if leaf is opening: break Loading @@ -505,7 +505,7 @@ def maybe_remove_trailing_comma(self, closing: Leaf) -> bool: if leaf is closing: break bracket_depth = leaf.bracket_depth # type: ignore bracket_depth = leaf.bracket_depth if bracket_depth == depth and leaf.type == token.COMMA: commas += 1 if commas > 1: Loading Loading @@ -1180,7 +1180,7 @@ def left_hand_split(line: Line, py36: bool = False) -> Iterator[Line]: if ( current_leaves is body_leaves 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.append(leaf) Loading Loading @@ -1234,7 +1234,7 @@ def right_hand_split(line: Line, py36: bool = False) -> Iterator[Line]: current_leaves.append(leaf) if current_leaves is tail_leaves: if leaf.type in CLOSING_BRACKETS: opening_bracket = leaf.opening_bracket # type: ignore opening_bracket = leaf.opening_bracket current_leaves = body_leaves tail_leaves.reverse() body_leaves.reverse() Loading Loading @@ -1296,7 +1296,7 @@ def delimiter_split(line: Line, py36: bool = False) -> Iterator[Line]: current_line.append(comment_after, preformatted=True) lowest_depth = min(lowest_depth, leaf.bracket_depth) if ( leaf.bracket_depth == lowest_depth and # type: ignore leaf.bracket_depth == lowest_depth and leaf.type == token.STAR or leaf.type == token.DOUBLESTAR ): Loading Loading @@ -1355,8 +1355,8 @@ def is_python36(node: Node) -> bool: """ for n in node.pre_order(): if n.type == token.STRING: assert isinstance(n, Leaf) if n.value[:2] in {'f"', 'F"', "f'", "F'", 'rf', 'fr', 'RF', 'FR'}: value_head = n.value[:2] # type: ignore if value_head in {'f"', 'F"', "f'", "F'", 'rf', 'fr', 'RF', 'FR'}: return True elif ( Loading blib2to3/pytree.pyi +3 −0 Changes for blib2to3/pytree.pyi: 3 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -56,6 +56,9 @@ class Leaf(Base): value: Text fixers_applied: List[Any] 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: ... Loading Loading
black.py +10 −10 Changes for black.py: 10 added lines, 10 removed lines. Original line number Diff line number Diff line Loading @@ -347,8 +347,8 @@ def mark(self, leaf: Leaf) -> None: if leaf.type in CLOSING_BRACKETS: self.depth -= 1 opening_bracket = self.bracket_match.pop((self.depth, leaf.type)) leaf.opening_bracket = opening_bracket # type: ignore leaf.bracket_depth = self.depth # type: ignore leaf.opening_bracket = opening_bracket leaf.bracket_depth = self.depth if self.depth == 0: delim = is_delimiter(leaf) if delim: Loading Loading @@ -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 # trailing one is the only one, we might mistakenly change a tuple # into a different type by removing the comma. depth = closing.bracket_depth + 1 # type: ignore depth = closing.bracket_depth + 1 commas = 0 opening = closing.opening_bracket # type: ignore opening = closing.opening_bracket for _opening_index, leaf in enumerate(self.leaves): if leaf is opening: break Loading @@ -505,7 +505,7 @@ def maybe_remove_trailing_comma(self, closing: Leaf) -> bool: if leaf is closing: break bracket_depth = leaf.bracket_depth # type: ignore bracket_depth = leaf.bracket_depth if bracket_depth == depth and leaf.type == token.COMMA: commas += 1 if commas > 1: Loading Loading @@ -1180,7 +1180,7 @@ def left_hand_split(line: Line, py36: bool = False) -> Iterator[Line]: if ( current_leaves is body_leaves 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.append(leaf) Loading Loading @@ -1234,7 +1234,7 @@ def right_hand_split(line: Line, py36: bool = False) -> Iterator[Line]: current_leaves.append(leaf) if current_leaves is tail_leaves: if leaf.type in CLOSING_BRACKETS: opening_bracket = leaf.opening_bracket # type: ignore opening_bracket = leaf.opening_bracket current_leaves = body_leaves tail_leaves.reverse() body_leaves.reverse() Loading Loading @@ -1296,7 +1296,7 @@ def delimiter_split(line: Line, py36: bool = False) -> Iterator[Line]: current_line.append(comment_after, preformatted=True) lowest_depth = min(lowest_depth, leaf.bracket_depth) if ( leaf.bracket_depth == lowest_depth and # type: ignore leaf.bracket_depth == lowest_depth and leaf.type == token.STAR or leaf.type == token.DOUBLESTAR ): Loading Loading @@ -1355,8 +1355,8 @@ def is_python36(node: Node) -> bool: """ for n in node.pre_order(): if n.type == token.STRING: assert isinstance(n, Leaf) if n.value[:2] in {'f"', 'F"', "f'", "F'", 'rf', 'fr', 'RF', 'FR'}: value_head = n.value[:2] # type: ignore if value_head in {'f"', 'F"', "f'", "F'", 'rf', 'fr', 'RF', 'FR'}: return True elif ( Loading
blib2to3/pytree.pyi +3 −0 Changes for blib2to3/pytree.pyi: 3 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -56,6 +56,9 @@ class Leaf(Base): value: Text fixers_applied: List[Any] 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: ... Loading