From 0bb1647fd15cc112098daf9961b2e01cb4e9cd23 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Mon, 3 Jul 2023 12:41:39 -0400 Subject: move various bits of type-checking only code to TYPE_CHECKING blocks Mostly detected with flake8-type-checking. Also quote T.cast() first arguments, since those are not affected by future annotations. --- mesonbuild/modules/python.py | 2 +- mesonbuild/modules/rust.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'mesonbuild/modules') diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py index 1f05f08d4..f6c82e0d6 100644 --- a/mesonbuild/modules/python.py +++ b/mesonbuild/modules/python.py @@ -333,7 +333,7 @@ class PythonModule(ExtensionModule): for i in self.installations.values(): if isinstance(i, PythonExternalProgram) and i.run_bytecompile[i.info['version']]: - i = T.cast(PythonExternalProgram, i) + i = T.cast('PythonExternalProgram', i) manifest = f'python-{i.info["version"]}-installed.json' manifest_json = [] for name, f in py_files: diff --git a/mesonbuild/modules/rust.py b/mesonbuild/modules/rust.py index 3514412e6..4f5494af3 100644 --- a/mesonbuild/modules/rust.py +++ b/mesonbuild/modules/rust.py @@ -18,16 +18,16 @@ import typing as T from . import ExtensionModule, ModuleReturnValue, ModuleInfo from .. import mlog -from ..build import BothLibraries, BuildTarget, CustomTargetIndex, Executable, ExtractedObjects, GeneratedList, IncludeDirs, CustomTarget, InvalidArguments, Jar, StructuredSources +from ..build import BothLibraries, BuildTarget, CustomTargetIndex, Executable, ExtractedObjects, GeneratedList, CustomTarget, InvalidArguments, Jar, StructuredSources from ..compilers.compilers import are_asserts_disabled -from ..dependencies import Dependency, ExternalLibrary from ..interpreter.type_checking import DEPENDENCIES_KW, LINK_WITH_KW, TEST_KWS, OUTPUT_KW, INCLUDE_DIRECTORIES from ..interpreterbase import ContainerTypeInfo, InterpreterException, KwargInfo, typed_kwargs, typed_pos_args, noPosargs from ..mesonlib import File if T.TYPE_CHECKING: from . import ModuleState - from ..build import LibTypes + from ..build import IncludeDirs, LibTypes + from ..dependencies import Dependency, ExternalLibrary from ..interpreter import Interpreter from ..interpreter import kwargs as _kwargs from ..interpreter.interpreter import SourceInputs, SourceOutputs -- cgit v1.2.3