diff options
author | Eli Schwartz <eschwartz@archlinux.org> | 2022-03-22 20:28:59 -0400 |
---|---|---|
committer | Eli Schwartz <eschwartz@archlinux.org> | 2022-03-29 16:44:54 -0400 |
commit | c9938f8f60c0b7cca7a5668807b17badb7861c86 (patch) | |
tree | 6bbdb301a2c8ce4b92866a04703ada96241683b4 /mesonbuild/modules | |
parent | 05cfe756f1c2dbd212aa6d30a3879cfe47a7f2fd (diff) | |
download | meson-c9938f8f60c0b7cca7a5668807b17badb7861c86.zip meson-c9938f8f60c0b7cca7a5668807b17badb7861c86.tar.gz meson-c9938f8f60c0b7cca7a5668807b17badb7861c86.tar.bz2 |
move a bunch of imports into TYPE_CHECKING blocks
These are only used for type checking, so don't bother importing them at
runtime.
Generally add future annotations at the same time, to make sure that
existing uses of these imports don't need to be quoted.
Diffstat (limited to 'mesonbuild/modules')
-rw-r--r-- | mesonbuild/modules/fs.py | 2 | ||||
-rw-r--r-- | mesonbuild/modules/gnome.py | 4 | ||||
-rw-r--r-- | mesonbuild/modules/java.py | 12 | ||||
-rw-r--r-- | mesonbuild/modules/qt.py | 7 |
4 files changed, 18 insertions, 7 deletions
diff --git a/mesonbuild/modules/fs.py b/mesonbuild/modules/fs.py index 5faee83..d0f5e2e 100644 --- a/mesonbuild/modules/fs.py +++ b/mesonbuild/modules/fs.py @@ -21,7 +21,6 @@ from .. import mlog from . import ExtensionModule from ..mesonlib import ( File, - FileOrString, MesonException, path_is_in_root, ) @@ -30,6 +29,7 @@ from ..interpreterbase import FeatureNew, KwargInfo, typed_kwargs, typed_pos_arg if T.TYPE_CHECKING: from . import ModuleState from ..interpreter import Interpreter + from ..mesonlib import FileOrString from typing_extensions import TypedDict diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 484938e..5376d00 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -14,6 +14,7 @@ '''This module provides helper functions for Gnome/GLib related functionality such as gobject-introspection, gresources and gtk-doc''' +from __future__ import annotations import copy import itertools @@ -30,7 +31,7 @@ from .. import build from .. import interpreter from .. import mesonlib from .. import mlog -from ..build import BuildTarget, CustomTarget, CustomTargetIndex, Executable, GeneratedList, InvalidArguments +from ..build import CustomTarget, CustomTargetIndex, Executable, GeneratedList, InvalidArguments from ..dependencies import Dependency, PkgConfigDependency, InternalDependency from ..interpreter.type_checking import DEPENDS_KW, DEPEND_FILES_KW, INSTALL_KW, NoneType, in_set_validator from ..interpreterbase import noPosargs, noKwargs, FeatureNew, FeatureDeprecated @@ -46,6 +47,7 @@ if T.TYPE_CHECKING: from typing_extensions import Literal, TypedDict from . import ModuleState + from ..build import BuildTarget from ..compilers import Compiler from ..interpreter import Interpreter from ..interpreterbase import TYPE_var, TYPE_kwargs diff --git a/mesonbuild/modules/java.py b/mesonbuild/modules/java.py index 22b8d2c..a8e5062 100644 --- a/mesonbuild/modules/java.py +++ b/mesonbuild/modules/java.py @@ -11,17 +11,23 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +from __future__ import annotations import os import pathlib import typing as T + from mesonbuild import mesonlib from mesonbuild.build import CustomTarget, CustomTargetIndex, GeneratedList, Target -from mesonbuild.compilers import detect_compiler_for, Compiler -from mesonbuild.interpreter import Interpreter +from mesonbuild.compilers import detect_compiler_for from mesonbuild.interpreterbase.decorators import ContainerTypeInfo, FeatureDeprecated, FeatureNew, KwargInfo, typed_pos_args, typed_kwargs from mesonbuild.mesonlib import version_compare, MachineChoice -from . import NewExtensionModule, ModuleReturnValue, ModuleState +from . import NewExtensionModule, ModuleReturnValue + +if T.TYPE_CHECKING: + from . import ModuleState + from ..compilers import Compiler + from ..interpreter import Interpreter class JavaModule(NewExtensionModule): @FeatureNew('Java Module', '0.60.0') diff --git a/mesonbuild/modules/qt.py b/mesonbuild/modules/qt.py index 81dd3e9..99581a4 100644 --- a/mesonbuild/modules/qt.py +++ b/mesonbuild/modules/qt.py @@ -12,6 +12,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +from __future__ import annotations import os import shutil @@ -23,17 +24,19 @@ from .. import build from .. import coredata from .. import mlog from ..dependencies import find_external_dependency, Dependency, ExternalLibrary -from ..mesonlib import MesonException, File, FileOrString, version_compare, Popen_safe +from ..mesonlib import MesonException, File, version_compare, Popen_safe from ..interpreter import extract_required_kwarg from ..interpreter.type_checking import NoneType from ..interpreterbase import ContainerTypeInfo, FeatureDeprecated, KwargInfo, noPosargs, FeatureNew, typed_kwargs -from ..programs import ExternalProgram, NonExistingExternalProgram +from ..programs import NonExistingExternalProgram if T.TYPE_CHECKING: from . import ModuleState from ..dependencies.qt import QtPkgConfigDependency, QmakeQtDependency from ..interpreter import Interpreter from ..interpreter import kwargs + from ..mesonlib import FileOrString + from ..programs import ExternalProgram QtDependencyType = T.Union[QtPkgConfigDependency, QmakeQtDependency] |