aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/modules
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.com>2021-04-01 08:18:44 -0400
committerXavier Claessens <xclaesse@gmail.com>2021-04-01 14:26:33 -0400
commit558a7bc6ff875f233b2ab7531e59e296b98032bd (patch)
tree6f84e2788819c9decaa0b1d72edd35c0eb8e77ac /mesonbuild/modules
parent2cd0723c42ae2076c7ba2b888fd7a5235d5cbf17 (diff)
downloadmeson-558a7bc6ff875f233b2ab7531e59e296b98032bd.zip
meson-558a7bc6ff875f233b2ab7531e59e296b98032bd.tar.gz
meson-558a7bc6ff875f233b2ab7531e59e296b98032bd.tar.bz2
interpreter: Move to its own folder and split it
Diffstat (limited to 'mesonbuild/modules')
-rw-r--r--mesonbuild/modules/cmake.py3
-rw-r--r--mesonbuild/modules/keyval.py3
-rw-r--r--mesonbuild/modules/unstable_rust.py4
3 files changed, 5 insertions, 5 deletions
diff --git a/mesonbuild/modules/cmake.py b/mesonbuild/modules/cmake.py
index 84fe658..ee09359 100644
--- a/mesonbuild/modules/cmake.py
+++ b/mesonbuild/modules/cmake.py
@@ -20,8 +20,9 @@ from . import ExtensionModule, ModuleReturnValue
from .. import build, mesonlib, mlog
from ..cmake import SingleTargetOptions, TargetOptions, cmake_defines_to_args
-from ..interpreter import ConfigurationDataHolder, InterpreterException, SubprojectHolder, DependencyHolder
+from ..interpreter import ConfigurationDataHolder, SubprojectHolder, DependencyHolder
from ..interpreterbase import (
+ InterpreterException,
InterpreterObject,
ObjectHolder,
diff --git a/mesonbuild/modules/keyval.py b/mesonbuild/modules/keyval.py
index 8123a57..5fc4d52 100644
--- a/mesonbuild/modules/keyval.py
+++ b/mesonbuild/modules/keyval.py
@@ -16,8 +16,7 @@ from . import ExtensionModule
from .. import mesonlib
from ..mesonlib import typeslistify
-from ..interpreterbase import FeatureNew, noKwargs
-from ..interpreter import InvalidCode
+from ..interpreterbase import FeatureNew, noKwargs, InvalidCode
import os
diff --git a/mesonbuild/modules/unstable_rust.py b/mesonbuild/modules/unstable_rust.py
index 91f7146..36d3164 100644
--- a/mesonbuild/modules/unstable_rust.py
+++ b/mesonbuild/modules/unstable_rust.py
@@ -19,8 +19,8 @@ from . import ExtensionModule, ModuleReturnValue
from .. import mlog
from ..build import BuildTarget, CustomTargetIndex, Executable, GeneratedList, InvalidArguments, IncludeDirs, CustomTarget
from ..dependencies import Dependency, ExternalLibrary
-from ..interpreter import ExecutableHolder, BuildTargetHolder, CustomTargetHolder, permitted_kwargs, noPosargs
-from ..interpreterbase import InterpreterException, permittedKwargs, FeatureNew, typed_pos_args
+from ..interpreter import ExecutableHolder, BuildTargetHolder, CustomTargetHolder, permitted_kwargs
+from ..interpreterbase import InterpreterException, permittedKwargs, FeatureNew, typed_pos_args, noPosargs
from ..mesonlib import stringlistify, unholder, listify, typeslistify, File
if T.TYPE_CHECKING: