diff --git a/mypy/plugins/dataclasses.py b/mypy/plugins/dataclasses.py index b46b42f78866..2b4982a36bb6 100644 --- a/mypy/plugins/dataclasses.py +++ b/mypy/plugins/dataclasses.py @@ -359,12 +359,12 @@ def transform(self) -> bool: if decorator_arguments["frozen"]: if any(not parent["frozen"] for parent in parent_decorator_arguments): - self._api.fail("Cannot inherit frozen dataclass from a non-frozen one", info) + self._api.fail("Frozen dataclass cannot inherit from a non-frozen dataclass", info) self._propertize_callables(attributes, settable=False) self._freeze(attributes) else: if any(parent["frozen"] for parent in parent_decorator_arguments): - self._api.fail("Cannot inherit non-frozen dataclass from a frozen one", info) + self._api.fail("Non-frozen dataclass cannot inherit from a frozen dataclass", info) self._propertize_callables(attributes) if decorator_arguments["slots"]: diff --git a/test-data/unit/check-dataclasses.test b/test-data/unit/check-dataclasses.test index 048ac831dd25..dbcb4c82072c 100644 --- a/test-data/unit/check-dataclasses.test +++ b/test-data/unit/check-dataclasses.test @@ -260,7 +260,7 @@ class FrozenBase: pass @dataclass -class BadNormalDerived(FrozenBase): # E: Cannot inherit non-frozen dataclass from a frozen one +class BadNormalDerived(FrozenBase): # E: Non-frozen dataclass cannot inherit from a frozen dataclass pass @dataclass @@ -268,7 +268,7 @@ class NormalBase: pass @dataclass(frozen=True) -class BadFrozenDerived(NormalBase): # E: Cannot inherit frozen dataclass from a non-frozen one +class BadFrozenDerived(NormalBase): # E: Frozen dataclass cannot inherit from a non-frozen dataclass pass [builtins fixtures/dataclasses.pyi]