From 1b15d577d48f6a7b4e06c73ce4706e27ae77a68a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20van=20Noord?= <13665637+DanielNoord@users.noreply.github.com> Date: Tue, 6 Feb 2024 10:32:30 +0100 Subject: [PATCH 1/2] Use ``is_valid_field`` from 1.x for ``mypy`` plugin --- pydantic/v1/mypy.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pydantic/v1/mypy.py b/pydantic/v1/mypy.py index 1d6d5ae283..ad3dc3d80c 100644 --- a/pydantic/v1/mypy.py +++ b/pydantic/v1/mypy.py @@ -65,8 +65,6 @@ from mypy.util import get_unique_redefinition_name from mypy.version import __version__ as mypy_version -from pydantic.utils import is_valid_field - try: from mypy.types import TypeVarDef # type: ignore[attr-defined] except ImportError: # pragma: no cover @@ -94,6 +92,12 @@ def parse_mypy_version(version: str) -> Tuple[int, ...]: __version__ = 2 +def is_valid_field(name: str) -> bool: + if not name.startswith('_'): + return True + return ROOT_KEY == name + + def plugin(version: str) -> 'TypingType[Plugin]': """ `version` is the mypy version string From bd50c622e08db1a6ab256c7f951c554e9d3bf57f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20van=20Noord?= <13665637+DanielNoord@users.noreply.github.com> Date: Wed, 7 Feb 2024 15:32:10 +0100 Subject: [PATCH 2/2] Import ``is_valid_field`` from ``.utils`` instead --- pydantic/v1/mypy.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pydantic/v1/mypy.py b/pydantic/v1/mypy.py index ad3dc3d80c..0262120f1b 100644 --- a/pydantic/v1/mypy.py +++ b/pydantic/v1/mypy.py @@ -65,6 +65,8 @@ from mypy.util import get_unique_redefinition_name from mypy.version import __version__ as mypy_version +from .utils import is_valid_field + try: from mypy.types import TypeVarDef # type: ignore[attr-defined] except ImportError: # pragma: no cover @@ -92,12 +94,6 @@ def parse_mypy_version(version: str) -> Tuple[int, ...]: __version__ = 2 -def is_valid_field(name: str) -> bool: - if not name.startswith('_'): - return True - return ROOT_KEY == name - - def plugin(version: str) -> 'TypingType[Plugin]': """ `version` is the mypy version string