aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2023-08-17 17:50:43 -0400
committerEli Schwartz <eschwartz@archlinux.org>2023-08-17 18:01:41 -0400
commite313f78465f3d3570838f77372f1b35ad6917770 (patch)
tree5ed4e575bc6601c96723c2598ae5816d04d5b623 /mesonbuild
parent7a2b673d405853fc8596dbafee42926da621a057 (diff)
downloadmeson-e313f78465f3d3570838f77372f1b35ad6917770.zip
meson-e313f78465f3d3570838f77372f1b35ad6917770.tar.gz
meson-e313f78465f3d3570838f77372f1b35ad6917770.tar.bz2
fix style errors in fs.relative_to implementation
In commit f52bcaa27fc125ab9ae583af466ba99c164169f3 a few issues were added: - doc typo - imports for utils.universal are not intended to be directly used, it's an internal wrapper that exists solely to make mesonlib work well as it always did while simultaneously allowing `meson --internal` codepaths to avoid importing anything other than an extremely stripped down core - type annotation specific import was imported at runtime scope
Diffstat (limited to 'mesonbuild')
-rw-r--r--mesonbuild/modules/fs.py10
1 files changed, 2 insertions, 8 deletions
diff --git a/mesonbuild/modules/fs.py b/mesonbuild/modules/fs.py
index a2dbdf2..89aead0 100644
--- a/mesonbuild/modules/fs.py
+++ b/mesonbuild/modules/fs.py
@@ -23,19 +23,13 @@ from .. import mlog
from ..build import BuildTarget, CustomTarget, CustomTargetIndex, InvalidArguments
from ..interpreter.type_checking import INSTALL_KW, INSTALL_MODE_KW, INSTALL_TAG_KW, NoneType
from ..interpreterbase import FeatureNew, KwargInfo, typed_kwargs, typed_pos_args, noKwargs
-from ..interpreterbase.baseobjects import TYPE_kwargs
-from ..mesonlib import (
- File,
- MesonException,
- has_path_sep,
- path_is_in_root,
-)
-from ..utils.universal import relpath
+from ..mesonlib import File, MesonException, has_path_sep, path_is_in_root, relpath
if T.TYPE_CHECKING:
from . import ModuleState
from ..build import BuildTargetTypes
from ..interpreter import Interpreter
+ from ..interpreterbase import TYPE_kwargs
from ..mesonlib import FileOrString, FileMode
from typing_extensions import TypedDict