The ufmt tool combines usort and black with a consistent wrapper,

which ensures we won't have inconsistent black-vs-isort errors going forward. We can always format by running `ufmt format .` at the root, and check with `ufmt check .` in our CI actions.
Instagram · Aug 25, 2021 · 98a37d0 · 98a37d0
1 parent 5928f6a
commit 98a37d0
Show file tree

Hide file tree

Showing 73 changed files with 8 additions and 88 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -69,8 +69,7 @@ jobs:
       if: steps.cache.outputs.cache-hit != 'true'
       run: exit 1
     - run: flake8
-    - run: isort --check-only .
-    - run: black --check libcst/
+    - run: ufmt check .
     - run: python3 -m fixit.cli.run_rules
 
 # Run pyre typechecker

diff --git a/libcst/__init__.py b/libcst/__init__.py
@@ -192,7 +192,6 @@
 from libcst._removal_sentinel import RemovalSentinel, RemoveFromParent
 from libcst._visitors import CSTNodeT, CSTTransformer, CSTVisitor, CSTVisitorT
 
-
 try:
     from libcst._version import version as LIBCST_VERSION
 except ImportError:
@@ -207,7 +206,6 @@
 )
 from libcst.metadata.wrapper import MetadataWrapper
 
-
 __all__ = [
     "KNOWN_PYTHON_VERSION_STRINGS",
     "LIBCST_VERSION",

diff --git a/libcst/_add_slots.py b/libcst/_add_slots.py
@@ -5,7 +5,6 @@
 import dataclasses
 from typing import Any, Mapping, Type, TypeVar
 
-
 _T = TypeVar("_T")
 
 

diff --git a/libcst/_batched_visitor.py b/libcst/_batched_visitor.py
@@ -19,7 +19,6 @@
 from libcst._typed_visitor import CSTTypedVisitorFunctions
 from libcst._visitors import CSTNodeT, CSTVisitor
 
-
 if TYPE_CHECKING:
     from libcst._nodes.base import CSTNode  # noqa: F401
 

diff --git a/libcst/_exceptions.py b/libcst/_exceptions.py
@@ -13,7 +13,6 @@
 from libcst._parser.types.token import Token
 from libcst._tabs import expand_tabs
 
-
 _EOF_STR: str = "end of file (EOF)"
 _INDENT_STR: str = "an indent"
 _DEDENT_STR: str = "a dedent"

diff --git a/libcst/_flatten_sentinel.py b/libcst/_flatten_sentinel.py
@@ -5,7 +5,6 @@
 
 import sys
 
-
 # PEP 585
 if sys.version_info < (3, 9):
     from typing import Iterable, Sequence

diff --git a/libcst/_metadata_dependent.py b/libcst/_metadata_dependent.py
@@ -17,7 +17,6 @@
     cast,
 )
 
-
 if TYPE_CHECKING:
     # Circular dependency for typing reasons only
     from libcst._nodes.base import CSTNode  # noqa: F401

diff --git a/libcst/_nodes/base.py b/libcst/_nodes/base.py
@@ -15,7 +15,6 @@
 from libcst._types import CSTNodeT
 from libcst._visitors import CSTTransformer, CSTVisitor, CSTVisitorT
 
-
 _CSTNodeSelfT = TypeVar("_CSTNodeSelfT", bound="CSTNode")
 _EMPTY_SEQUENCE: Sequence["CSTNode"] = ()
 

diff --git a/libcst/_nodes/internal.py b/libcst/_nodes/internal.py
@@ -14,7 +14,6 @@
 from libcst._removal_sentinel import RemovalSentinel
 from libcst._types import CSTNodeT
 
-
 if TYPE_CHECKING:
     # These are circular dependencies only used for typing purposes
     from libcst._nodes.base import CSTNode  # noqa: F401

diff --git a/libcst/_nodes/module.py b/libcst/_nodes/module.py
@@ -18,7 +18,6 @@
 from libcst._removal_sentinel import RemovalSentinel
 from libcst._visitors import CSTVisitorT
 
-
 if TYPE_CHECKING:
     # This is circular, so import the type only in type checking
     from libcst._parser.types.config import PartialParserConfig

diff --git a/libcst/_nodes/statement.py b/libcst/_nodes/statement.py
@@ -49,7 +49,6 @@
 )
 from libcst._visitors import CSTVisitorT
 
-
 _INDENT_WHITESPACE_RE: Pattern[str] = re.compile(r"[ \f\t]+", re.UNICODE)
 
 

diff --git a/libcst/_nodes/tests/test_cst_node.py b/libcst/_nodes/tests/test_cst_node.py
@@ -12,7 +12,6 @@
 from libcst._visitors import CSTTransformer
 from libcst.testing.utils import UnitTest, data_provider, none_throws
 
-
 _EMPTY_SIMPLE_WHITESPACE = cst.SimpleWhitespace("")
 
 

diff --git a/libcst/_nodes/whitespace.py b/libcst/_nodes/whitespace.py
@@ -19,7 +19,6 @@
 )
 from libcst._visitors import CSTVisitorT
 
-
 # SimpleWhitespace includes continuation characters, which must be followed immediately
 # by a newline. SimpleWhitespace does not include other kinds of newlines, because those
 # may have semantic significance.

diff --git a/libcst/_parser/base_parser.py b/libcst/_parser/base_parser.py
@@ -36,7 +36,6 @@
 from libcst._parser.parso.python.token import TokenType
 from libcst._parser.types.token import Token
 
-
 _NodeT = TypeVar("_NodeT")
 _TokenTypeT = TypeVar("_TokenTypeT", bound=TokenType)
 _TokenT = TypeVar("_TokenT", bound=Token)

diff --git a/libcst/_parser/conversions/expression.py b/libcst/_parser/conversions/expression.py
@@ -121,7 +121,6 @@
 from libcst._parser.types.token import Token
 from libcst._parser.whitespace_parser import parse_parenthesizable_whitespace
 
-
 BINOP_TOKEN_LUT: typing.Dict[str, typing.Type[BaseBinaryOp]] = {
     "*": Multiply,
     "@": MatrixMultiply,

diff --git a/libcst/_parser/conversions/statement.py b/libcst/_parser/conversions/statement.py
@@ -101,7 +101,6 @@
     parse_simple_whitespace,
 )
 
-
 AUGOP_TOKEN_LUT: Dict[str, Type[BaseAugOp]] = {
     "+=": AddAssign,
     "-=": SubtractAssign,

diff --git a/libcst/_parser/custom_itertools.py b/libcst/_parser/custom_itertools.py
@@ -6,7 +6,6 @@
 from itertools import zip_longest
 from typing import Iterable, Iterator, TypeVar
 
-
 _T = TypeVar("_T")
 
 

diff --git a/libcst/_parser/detect_config.py b/libcst/_parser/detect_config.py
@@ -18,7 +18,6 @@
 from libcst._parser.types.token import Token
 from libcst._parser.wrapped_tokenize import tokenize_lines
 
-
 _INDENT: TokenType = PythonTokenTypes.INDENT
 _NAME: TokenType = PythonTokenTypes.NAME
 _NEWLINE: TokenType = PythonTokenTypes.NEWLINE

diff --git a/libcst/_parser/entrypoints.py b/libcst/_parser/entrypoints.py
@@ -20,7 +20,6 @@
 from libcst._parser.python_parser import PythonCSTParser
 from libcst._parser.types.config import PartialParserConfig
 
-
 _DEFAULT_PARTIAL_PARSER_CONFIG: PartialParserConfig = PartialParserConfig()
 
 

diff --git a/libcst/_parser/grammar.py b/libcst/_parser/grammar.py
@@ -141,7 +141,6 @@
 from libcst._parser.types.conversions import NonterminalConversion, TerminalConversion
 from libcst._parser.types.production import Production
 
-
 # Keep this sorted alphabetically
 _TERMINAL_CONVERSIONS_SEQUENCE: Tuple[TerminalConversion, ...] = (
     convert_DEDENT,

diff --git a/libcst/_parser/parso/pgen2/generator.py b/libcst/_parser/parso/pgen2/generator.py
@@ -39,7 +39,6 @@
 
 from libcst._parser.parso.pgen2.grammar_parser import GrammarParser, NFAState
 
-
 _TokenTypeT = TypeVar("_TokenTypeT")
 
 

diff --git a/libcst/_parser/parso/python/tokenize.py b/libcst/_parser/parso/python/tokenize.py
@@ -39,7 +39,6 @@
 from libcst._parser.parso.python.token import PythonTokenTypes
 from libcst._parser.parso.utils import PythonVersionInfo, split_lines
 
-
 # Maximum code point of Unicode 6.0: 0x10ffff (1,114,111)
 MAX_UNICODE = "\U0010ffff"
 BOM_UTF8_STRING = BOM_UTF8.decode("utf-8")

diff --git a/libcst/_parser/parso/tests/test_tokenize.py b/libcst/_parser/parso/tests/test_tokenize.py
@@ -22,7 +22,6 @@
 from libcst._parser.parso.utils import parse_version_string, split_lines
 from libcst.testing.utils import UnitTest, data_provider
 
-
 # To make it easier to access some of the token types, just put them here.
 NAME = PythonTokenTypes.NAME
 NEWLINE = PythonTokenTypes.NEWLINE

diff --git a/libcst/_parser/parso/utils.py b/libcst/_parser/parso/utils.py
@@ -23,7 +23,6 @@
 from dataclasses import dataclass
 from typing import Optional, Sequence, Tuple, Union
 
-
 # The following is a list in Python that are line breaks in str.splitlines, but
 # not in Python. In Python only \r (Carriage Return, 0xD) and \n (Line Feed,
 # 0xA) are allowed to split lines.

diff --git a/libcst/_parser/production_decorator.py b/libcst/_parser/production_decorator.py
@@ -8,7 +8,6 @@
 from libcst._parser.types.conversions import NonterminalConversion
 from libcst._parser.types.production import Production
 
-
 _NonterminalConversionT = TypeVar(
     "_NonterminalConversionT", bound=NonterminalConversion
 )

diff --git a/libcst/_parser/tests/test_whitespace_parser.py b/libcst/_parser/tests/test_whitespace_parser.py
@@ -17,7 +17,6 @@
 )
 from libcst.testing.utils import UnitTest, data_provider
 
-
 _T = TypeVar("_T")
 
 

diff --git a/libcst/_parser/tests/test_wrapped_tokenize.py b/libcst/_parser/tests/test_wrapped_tokenize.py
@@ -13,7 +13,6 @@
 from libcst._parser.wrapped_tokenize import Token, tokenize
 from libcst.testing.utils import UnitTest, data_provider
 
-
 _PY38 = parse_version_string("3.8.0")
 _PY37 = parse_version_string("3.7.0")
 _PY36 = parse_version_string("3.6.0")

diff --git a/libcst/_parser/types/config.py b/libcst/_parser/types/config.py
@@ -16,7 +16,6 @@
 from libcst._nodes.whitespace import NEWLINE_RE
 from libcst._parser.parso.utils import PythonVersionInfo, parse_version_string
 
-
 _INDENT_RE: Pattern[str] = re.compile(r"[ \t]+")
 
 

diff --git a/libcst/_parser/types/conversions.py b/libcst/_parser/types/conversions.py
@@ -8,7 +8,6 @@
 from libcst._parser.types.config import ParserConfig
 from libcst._parser.types.token import Token
 
-
 # pyre-fixme[33]: Aliased annotation cannot contain `Any`.
 NonterminalConversion = Callable[[ParserConfig, Sequence[Any]], Any]
 # pyre-fixme[33]: Aliased annotation cannot contain `Any`.

diff --git a/libcst/_parser/types/partials.py b/libcst/_parser/types/partials.py
@@ -29,7 +29,6 @@
 from libcst._nodes.whitespace import EmptyLine, SimpleWhitespace, TrailingWhitespace
 from libcst._parser.types.whitespace_state import WhitespaceState
 
-
 _T = TypeVar("_T")
 
 

diff --git a/libcst/_parser/whitespace_parser.py b/libcst/_parser/whitespace_parser.py
@@ -31,7 +31,6 @@
 from libcst._parser.types.config import BaseWhitespaceParserConfig
 from libcst._parser.types.whitespace_state import WhitespaceState as State
 
-
 # BEGIN PARSER ENTRYPOINTS
 
 

diff --git a/libcst/_parser/wrapped_tokenize.py b/libcst/_parser/wrapped_tokenize.py
@@ -35,7 +35,6 @@
 from libcst._parser.types.token import Token
 from libcst._parser.types.whitespace_state import WhitespaceState
 
-
 _ERRORTOKEN: TokenType = PythonTokenTypes.ERRORTOKEN
 _ERROR_DEDENT: TokenType = PythonTokenTypes.ERROR_DEDENT
 

diff --git a/libcst/_position.py b/libcst/_position.py
@@ -17,7 +17,6 @@
 
 from libcst._add_slots import add_slots
 
-
 _CodePositionT = Union[Tuple[int, int], "CodePosition"]
 
 

diff --git a/libcst/_type_enforce.py b/libcst/_type_enforce.py
@@ -8,7 +8,6 @@
 from typing_extensions import Literal
 from typing_inspect import get_args, get_origin, is_classvar, is_typevar, is_union_type
 
-
 try:  # py37+
     from typing import ForwardRef
 except ImportError:  # py36

diff --git a/libcst/_typed_visitor.py b/libcst/_typed_visitor.py
@@ -12,7 +12,6 @@
 from libcst._removal_sentinel import RemovalSentinel
 from libcst._typed_visitor_base import mark_no_op
 
-
 if TYPE_CHECKING:
     from libcst._nodes.expression import (  # noqa: F401
         Annotation,

diff --git a/libcst/_typed_visitor_base.py b/libcst/_typed_visitor_base.py
@@ -5,7 +5,6 @@
 
 from typing import TYPE_CHECKING, Any, Callable, TypeVar, cast
 
-
 if TYPE_CHECKING:
     from libcst._typed_visitor import CSTTypedBaseFunctions  # noqa: F401
 

diff --git a/libcst/_types.py b/libcst/_types.py
@@ -6,7 +6,6 @@
 
 from typing import TYPE_CHECKING, TypeVar
 
-
 if TYPE_CHECKING:
     from libcst._nodes.base import CSTNode  # noqa: F401
 

diff --git a/libcst/_visitors.py b/libcst/_visitors.py
@@ -11,7 +11,6 @@
 from libcst._typed_visitor import CSTTypedTransformerFunctions, CSTTypedVisitorFunctions
 from libcst._types import CSTNodeT
 
-
 if TYPE_CHECKING:
     # Circular dependency for typing reasons only
     from libcst._nodes.base import CSTNode  # noqa: F401

diff --git a/libcst/codegen/gen_matcher_classes.py b/libcst/codegen/gen_matcher_classes.py
@@ -11,7 +11,6 @@
 from libcst import ensure_type, parse_expression
 from libcst.codegen.gather import all_libcst_nodes, typeclasses
 
-
 CST_DIR: Set[str] = set(dir(cst))
 CLASS_RE = r"<class \'(.*?)\'>"
 OPTIONAL_RE = r"typing\.Union\[([^,]*?), NoneType]"

diff --git a/libcst/codegen/gen_type_mapping.py b/libcst/codegen/gen_type_mapping.py
@@ -7,7 +7,6 @@
 
 from libcst.codegen.gather import imports, nodebases, nodeuses
 
-
 generated_code: List[str] = []
 generated_code.append("# Copyright (c) Facebook, Inc. and its affiliates.")
 generated_code.append("#")

diff --git a/libcst/codegen/gen_visitor_functions.py b/libcst/codegen/gen_visitor_functions.py
@@ -8,7 +8,6 @@
 
 from libcst.codegen.gather import imports, nodebases, nodeuses
 
-
 generated_code: List[str] = []
 generated_code.append("# Copyright (c) Facebook, Inc. and its affiliates.")
 generated_code.append("#")

diff --git a/libcst/codemod/__init__.py b/libcst/codemod/__init__.py
@@ -30,7 +30,6 @@
 from libcst.codemod._testing import CodemodTest
 from libcst.codemod._visitor import ContextAwareTransformer, ContextAwareVisitor
 
-
 __all__ = [
     "Codemod",
     "CodemodContext",

diff --git a/libcst/codemod/_cli.py b/libcst/codemod/_cli.py
@@ -34,7 +34,6 @@
 )
 from libcst.metadata import FullRepoManager
 
-
 _DEFAULT_GENERATED_CODE_MARKER: str = f"@gen{''}erated"
 
 

diff --git a/libcst/codemod/_command.py b/libcst/codemod/_command.py
@@ -15,7 +15,6 @@
 from libcst.codemod.visitors._add_imports import AddImportsVisitor
 from libcst.codemod.visitors._remove_imports import RemoveImportsVisitor
 
-
 _Codemod = TypeVar("_Codemod", bound=Codemod)
 
 

diff --git a/libcst/codemod/_dummy_pool.py b/libcst/codemod/_dummy_pool.py
@@ -6,7 +6,6 @@
 from types import TracebackType
 from typing import Callable, Generator, Iterable, Optional, Type, TypeVar
 
-
 RetT = TypeVar("RetT")
 ArgT = TypeVar("ArgT")
 

diff --git a/libcst/codemod/_runner.py b/libcst/codemod/_runner.py
@@ -16,7 +16,6 @@
 from libcst import PartialParserConfig, parse_module
 from libcst.codemod._codemod import Codemod
 
-
 # All datastructures defined in this class are pickleable so that they can be used
 # as a return value with the multiprocessing module.
 

diff --git a/libcst/codemod/commands/convert_percent_format_to_fstring.py b/libcst/codemod/commands/convert_percent_format_to_fstring.py
@@ -10,7 +10,6 @@
 import libcst.matchers as m
 from libcst.codemod import VisitorBasedCodemodCommand
 
-
 USE_FSTRING_SIMPLE_EXPRESSION_MAX_LENGTH = 30
 
 

diff --git a/libcst/codemod/commands/remove_unused_imports.py b/libcst/codemod/commands/remove_unused_imports.py
@@ -12,7 +12,6 @@
 from libcst.helpers import get_absolute_module_for_import
 from libcst.metadata import PositionProvider, ProviderT
 
-
 DEFAULT_SUPPRESS_COMMENT_REGEX = (
     r".*\W(noqa|lint-ignore: ?unused-import|lint-ignore: ?F401)(\W.*)?$"
 )
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,7 +5,6 @@
		import dataclasses
		from typing import Any, Mapping, Type, TypeVar


		_T = TypeVar("_T")


Expand Down
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,6 @@ @@
         cast,
     )
     if TYPE_CHECKING:
         # Circular dependency for typing reasons only
         from libcst._nodes.base import CSTNode  # noqa: F401
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -49,7 +49,6 @@
		)
		from libcst._visitors import CSTVisitorT


		_INDENT_WHITESPACE_RE: Pattern[str] = re.compile(r"[ \f\t]+", re.UNICODE)


Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,7 +12,6 @@
		from libcst._visitors import CSTTransformer
		from libcst.testing.utils import UnitTest, data_provider, none_throws


		_EMPTY_SIMPLE_WHITESPACE = cst.SimpleWhitespace("")


Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,7 +6,6 @@
		from itertools import zip_longest
		from typing import Iterable, Iterator, TypeVar


		_T = TypeVar("_T")


Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,7 +20,6 @@
		from libcst._parser.python_parser import PythonCSTParser
		from libcst._parser.types.config import PartialParserConfig


		_DEFAULT_PARTIAL_PARSER_CONFIG: PartialParserConfig = PartialParserConfig()


Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -39,7 +39,6 @@

		from libcst._parser.parso.pgen2.grammar_parser import GrammarParser, NFAState


		_TokenTypeT = TypeVar("_TokenTypeT")


Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,7 +17,6 @@
		)
		from libcst.testing.utils import UnitTest, data_provider


		_T = TypeVar("_T")


Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,7 +16,6 @@
		from libcst._nodes.whitespace import NEWLINE_RE
		from libcst._parser.parso.utils import PythonVersionInfo, parse_version_string


		_INDENT_RE: Pattern[str] = re.compile(r"[ \t]+")


Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -29,7 +29,6 @@
		from libcst._nodes.whitespace import EmptyLine, SimpleWhitespace, TrailingWhitespace
		from libcst._parser.types.whitespace_state import WhitespaceState


		_T = TypeVar("_T")


Expand Down