Commit 31f41057 authored by Michael J. Sullivan's avatar Michael J. Sullivan Committed by Jelle Zijlstra
Browse files

Switch from attrs to dataclasses (#1116)

The main motivation here is that mypyc is going to have custom support
for dataclasses but probably not attrs.
parent 6bedb5c5
Loading
Loading
Loading
Loading
+1 −1
Changes for Pipfile: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ name = "pypi"

[packages]
aiohttp = ">=3.3.2"
attrs = ">=18.1.0"
click = ">=6.5"
appdirs = "*"
toml = ">=0.9.4"
@@ -14,6 +13,7 @@ aiohttp-cors = "*"
typed-ast = "==1.4.0"
regex = ">=2019.8"
pathspec = ">=0.6"
dataclasses = {version = ">=0.6", python_version = "< 3.7"}

[dev-packages]
pre-commit = "*"
+9 −1
Changes for Pipfile.lock: 9 added lines, 1 removed line.
Original line number Diff line number Diff line
{
    "_meta": {
        "hash": {
            "sha256": "0ae3ab3331dc4448fc4def999af38d91c13a566a482a6935c4a880f6bd9a6614"
            "sha256": "ad54dbd29085bc14caf655456b93d9f09e8556406ef956a5a05c20e30363ffa1"
        },
        "pipfile-spec": 6,
        "requires": {},
@@ -85,6 +85,14 @@
            "index": "pypi",
            "version": "==7.0"
        },
        "dataclasses": {
            "hashes": [
                "sha256:454a69d788c7fda44efd71e259be79577822f5e3f53f029a22d08004e951dc9f",
                "sha256:6988bd2b895eef432d562370bb707d540f32f7360ab13da45340101bc2307d84"
            ],
            "index": "pypi",
            "version": "==0.6"
        },
        "idna": {
            "hashes": [
                "sha256:c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407",
+15 −14
Changes for black.py: 15 added lines, 14 removed lines.
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@
)

from appdirs import user_cache_dir
from attr import dataclass, evolve, Factory
from dataclasses import dataclass, field, replace
import click
import toml
from typed_ast import ast3, ast27
@@ -185,7 +185,7 @@ class Feature(Enum):

@dataclass
class FileMode:
    target_versions: Set[TargetVersion] = Factory(set)
    target_versions: Set[TargetVersion] = field(default_factory=set)
    line_length: int = DEFAULT_LINE_LENGTH
    string_normalization: bool = True
    is_pyi: bool = False
@@ -629,7 +629,7 @@ def format_file_in_place(
    `mode` and `fast` options are passed to :func:`format_file_contents`.
    """
    if src.suffix == ".pyi":
        mode = evolve(mode, is_pyi=True)
        mode = replace(mode, is_pyi=True)

    then = datetime.utcfromtimestamp(src.stat().st_mtime)
    with open(src, "rb") as buf:
@@ -1028,11 +1028,11 @@ class BracketTracker:
    """Keeps track of brackets on a line."""

    depth: int = 0
    bracket_match: Dict[Tuple[Depth, NodeType], Leaf] = Factory(dict)
    delimiters: Dict[LeafID, Priority] = Factory(dict)
    bracket_match: Dict[Tuple[Depth, NodeType], Leaf] = field(default_factory=dict)
    delimiters: Dict[LeafID, Priority] = field(default_factory=dict)
    previous: Optional[Leaf] = None
    _for_loop_depths: List[int] = Factory(list)
    _lambda_argument_depths: List[int] = Factory(list)
    _for_loop_depths: List[int] = field(default_factory=list)
    _lambda_argument_depths: List[int] = field(default_factory=list)

    def mark(self, leaf: Leaf) -> None:
        """Mark `leaf` with bracket-related metadata. Keep track of delimiters.
@@ -1160,9 +1160,10 @@ class Line:
    """Holds leaves and comments. Can be printed with `str(line)`."""

    depth: int = 0
    leaves: List[Leaf] = Factory(list)
    comments: Dict[LeafID, List[Leaf]] = Factory(dict)  # keys ordered like `leaves`
    bracket_tracker: BracketTracker = Factory(BracketTracker)
    leaves: List[Leaf] = field(default_factory=list)
    # keys ordered like `leaves`
    comments: Dict[LeafID, List[Leaf]] = field(default_factory=dict)
    bracket_tracker: BracketTracker = field(default_factory=BracketTracker)
    inside_brackets: bool = False
    should_explode: bool = False

@@ -1565,7 +1566,7 @@ class EmptyLineTracker:
    is_pyi: bool = False
    previous_line: Optional[Line] = None
    previous_after: int = 0
    previous_defs: List[int] = Factory(list)
    previous_defs: List[int] = field(default_factory=list)

    def maybe_empty_lines(self, current_line: Line) -> Tuple[int, int]:
        """Return the number of extra empty lines before and after the `current_line`.
@@ -1679,7 +1680,7 @@ class LineGenerator(Visitor[Line]):

    is_pyi: bool = False
    normalize_strings: bool = True
    current_line: Line = Factory(Line)
    current_line: Line = field(default_factory=Line)
    remove_u_prefix: bool = False

    def line(self, indent: int = 0) -> Iterator[Line]:
@@ -1844,7 +1845,7 @@ def visit_factor(self, node: Node) -> Iterator[Line]:
            node.insert_child(index, Node(syms.atom, [lpar, operand, rpar]))
        yield from self.visit_default(node)

    def __attrs_post_init__(self) -> None:
    def __post_init__(self) -> None:
        """You are in a twisty little maze of passages."""
        v = self.visit_stmt
        Ø: Set[str] = set()
@@ -3712,7 +3713,7 @@ def _v(node: Union[ast.AST, ast3.AST, ast27.AST], depth: int = 0) -> Iterator[st

        yield f"{'  ' * depth}{node.__class__.__name__}("

        for field in sorted(node._fields):
        for field in sorted(node._fields):  # noqa: F402
            # TypeIgnore has only one field 'lineno' which breaks this comparison
            type_ignore_classes = (ast3.TypeIgnore, ast27.TypeIgnore)
            if sys.version_info >= (3, 8):
+1 −0
Changes for setup.py: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ def get_long_description() -> str:
        "typed-ast>=1.4.0",
        "regex",
        "pathspec>=0.6, <1",
        "dataclasses>=0.6; python_version < '3.7'",
    ],
    extras_require={"d": ["aiohttp>=3.3.2", "aiohttp-cors"]},
    test_suite="tests.test_black",