diff options
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/mintro.py | 16 | ||||
| -rw-r--r-- | mesonbuild/mtest.py | 18 |
2 files changed, 20 insertions, 14 deletions
diff --git a/mesonbuild/mintro.py b/mesonbuild/mintro.py index 9657da7..14f8d86 100644 --- a/mesonbuild/mintro.py +++ b/mesonbuild/mintro.py @@ -477,14 +477,18 @@ def list_machines(builddata: build.Build) -> T.Dict[str, T.Dict[str, T.Union[str return machines def list_projinfo(builddata: build.Build) -> T.Dict[str, T.Union[str, T.List[T.Dict[str, str]]]]: - result = {'version': builddata.project_version, - 'descriptive_name': builddata.project_name, - 'subproject_dir': builddata.subproject_dir} # type: T.Dict[str, T.Union[str, T.List[T.Dict[str, str]]]] + result: T.Dict[str, T.Union[str, T.List[T.Dict[str, str]]]] = { + 'version': builddata.project_version, + 'descriptive_name': builddata.project_name, + 'subproject_dir': builddata.subproject_dir, + } subprojects = [] for k, v in builddata.subprojects.items(): - c = {'name': k, - 'version': v, - 'descriptive_name': builddata.projects.get(k)} # type: T.Dict[str, str] + c: T.Dict[str, str] = { + 'name': k, + 'version': v, + 'descriptive_name': builddata.projects.get(k), + } subprojects.append(c) result['subprojects'] = subprojects return result diff --git a/mesonbuild/mtest.py b/mesonbuild/mtest.py index 2ee337c..36afd61 100644 --- a/mesonbuild/mtest.py +++ b/mesonbuild/mtest.py @@ -770,14 +770,16 @@ class TextLogfileBuilder(TestFileLogger): class JsonLogfileBuilder(TestFileLogger): def log(self, harness: 'TestHarness', result: 'TestRun') -> None: - jresult = {'name': result.name, - 'stdout': result.stdo, - 'result': result.res.value, - 'starttime': result.starttime, - 'duration': result.duration, - 'returncode': result.returncode, - 'env': result.env, - 'command': result.cmd} # type: T.Dict[str, T.Any] + jresult: T.Dict[str, T.Any] = { + 'name': result.name, + 'stdout': result.stdo, + 'result': result.res.value, + 'starttime': result.starttime, + 'duration': result.duration, + 'returncode': result.returncode, + 'env': result.env, + 'command': result.cmd, + } if result.stde: jresult['stderr'] = result.stde self.file.write(json.dumps(jresult) + '\n') |