diff options
| -rw-r--r-- | mesonbuild/dependencies/cmake.py | 2 | ||||
| -rw-r--r-- | mesonbuild/interpreter/primitives/string.py | 1 | ||||
| -rw-r--r-- | mesonbuild/modules/__init__.py | 4 | ||||
| -rw-r--r-- | mesonbuild/optinterpreter.py | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/mesonbuild/dependencies/cmake.py b/mesonbuild/dependencies/cmake.py index dcbe5df..691d402 100644 --- a/mesonbuild/dependencies/cmake.py +++ b/mesonbuild/dependencies/cmake.py @@ -13,7 +13,7 @@ # limitations under the License. from .base import ExternalDependency, DependencyException, DependencyTypeName -from ..mesonlib import is_windows, MesonException, OptionKey, PerMachine, stringlistify, extract_as_list +from ..mesonlib import is_windows, MesonException, PerMachine, stringlistify, extract_as_list from ..cmake import CMakeExecutor, CMakeTraceParser, CMakeException, CMakeToolchain, CMakeExecScope, check_cmake_args, CMakeTarget, resolve_cmake_trace_targets, cmake_is_debug from .. import mlog import importlib.resources diff --git a/mesonbuild/interpreter/primitives/string.py b/mesonbuild/interpreter/primitives/string.py index a5fc992..9cd51b4 100644 --- a/mesonbuild/interpreter/primitives/string.py +++ b/mesonbuild/interpreter/primitives/string.py @@ -3,7 +3,6 @@ import re import os -from pathlib import PurePath import typing as T diff --git a/mesonbuild/modules/__init__.py b/mesonbuild/modules/__init__.py index 8fe61c6..73e22ff 100644 --- a/mesonbuild/modules/__init__.py +++ b/mesonbuild/modules/__init__.py @@ -14,15 +14,15 @@ # This file contains the base representation for import('modname') -import os import typing as T from .. import build, mesonlib -from ..mesonlib import relpath, HoldableObject, MachineChoice, OptionKey +from ..mesonlib import relpath, HoldableObject, MachineChoice from ..interpreterbase.decorators import noKwargs, noPosargs if T.TYPE_CHECKING: from ..interpreter import Interpreter + from ..interpreter.interpreterobjects import MachineHolder from ..interpreterbase import TYPE_var, TYPE_kwargs from ..programs import ExternalProgram from ..wrap import WrapMode diff --git a/mesonbuild/optinterpreter.py b/mesonbuild/optinterpreter.py index 64c4af2..6155c2f 100644 --- a/mesonbuild/optinterpreter.py +++ b/mesonbuild/optinterpreter.py @@ -21,7 +21,7 @@ from . import mparser from . import mlog from .interpreterbase import FeatureNew, typed_pos_args, typed_kwargs, ContainerTypeInfo, KwargInfo, permittedKwargs if T.TYPE_CHECKING: - from .interpreterbase import TV_func, TYPE_var, TYPE_kwargs + from .interpreterbase import TYPE_var, TYPE_kwargs from typing_extensions import TypedDict FuncOptionArgs = TypedDict('FuncOptionArgs', { 'type': str, |