From 6b1b995b32a867614535ba1d1c80844b273fc053 Mon Sep 17 00:00:00 2001 From: Daniel Mensinger Date: Sun, 30 Aug 2020 13:15:09 +0200 Subject: typing: fully annotate fs module --- mesonbuild/modules/fs.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mesonbuild/modules') diff --git a/mesonbuild/modules/fs.py b/mesonbuild/modules/fs.py index d483111..5ba1e38 100644 --- a/mesonbuild/modules/fs.py +++ b/mesonbuild/modules/fs.py @@ -24,11 +24,11 @@ from ..interpreterbase import FeatureNew from ..interpreterbase import stringArgs, noKwargs if T.TYPE_CHECKING: - from ..interpreter import ModuleState + from ..interpreter import Interpreter, ModuleState class FSModule(ExtensionModule): - def __init__(self, interpreter): + def __init__(self, interpreter: 'Interpreter') -> None: super().__init__(interpreter) self.snippets.add('generate_dub_file') @@ -36,7 +36,7 @@ class FSModule(ExtensionModule): """ make an absolute path from a relative path, WITHOUT resolving symlinks """ - return Path(state.source_root) / state.subdir / Path(arg).expanduser() + return Path(state.source_root) / Path(state.subdir) / Path(arg).expanduser() def _resolve_dir(self, state: 'ModuleState', arg: str) -> Path: """ @@ -193,5 +193,5 @@ class FSModule(ExtensionModule): new = original.stem return ModuleReturnValue(str(new), []) -def initialize(*args, **kwargs) -> FSModule: +def initialize(*args: T.Any, **kwargs: T.Any) -> FSModule: return FSModule(*args, **kwargs) -- cgit v1.1 From 23818fc5a389c49e2673f79af2c90d9d56b1aaf0 Mon Sep 17 00:00:00 2001 From: Daniel Mensinger Date: Tue, 1 Sep 2020 14:28:08 +0200 Subject: typing: more fixes --- mesonbuild/modules/__init__.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'mesonbuild/modules') diff --git a/mesonbuild/modules/__init__.py b/mesonbuild/modules/__init__.py index 47be039..ff27a11 100644 --- a/mesonbuild/modules/__init__.py +++ b/mesonbuild/modules/__init__.py @@ -19,14 +19,18 @@ import os from .. import build from ..mesonlib import unholder +import typing as T +if T.TYPE_CHECKING: + from ..interpreter import Interpreter + from ..interpreterbase import TYPE_var class ExtensionModule: - def __init__(self, interpreter): + def __init__(self, interpreter: 'Interpreter') -> None: self.interpreter = interpreter - self.snippets = set() # List of methods that operate only on the interpreter. + self.snippets = set() # type: T.Set[str] # List of methods that operate only on the interpreter. - def is_snippet(self, funcname): + def is_snippet(self, funcname: str) -> bool: return funcname in self.snippets @@ -69,7 +73,7 @@ def is_module_library(fname): class ModuleReturnValue: - def __init__(self, return_value, new_objects): + def __init__(self, return_value: 'TYPE_var', new_objects: T.List['TYPE_var']) -> None: self.return_value = return_value assert(isinstance(new_objects, list)) self.new_objects = new_objects -- cgit v1.1