From a5089f2cb65567d9191f8681b8c17d82a95f489b Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 9 Sep 2026 12:30:58 +0200 Subject: [PATCH] adjust incorrect None checks for mypy strict_optional Remove them, or convert isinstance checks to "is not None". Signed-off-by: Paolo Bonzini --- mesonbuild/backend/vs2010backend.py | 8 +------- mesonbuild/cmake/interpreter.py | 2 +- mesonbuild/compilers/fortran.py | 2 +- mesonbuild/compilers/mixins/clike.py | 2 +- mesonbuild/mdist.py | 2 -- mesonbuild/modules/dlang.py | 5 +---- 6 files changed, 5 insertions(+), 16 deletions(-) diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index 8020304ca..5b46eb840 100644 --- a/mesonbuild/backend/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -2173,13 +2173,7 @@ class Vs2010Backend(backends.Backend): if 'masm' not in target.compilers: return None - if target.for_machine == MachineChoice.BUILD: - platform = self.build_platform - elif target.for_machine == MachineChoice.HOST: - platform = self.platform - else: - return None - + platform = self.build_platform if target.for_machine is MachineChoice.BUILD else self.platform if platform in {'ARM', 'arm64', 'arm64ec'}: return 'marmasm' else: diff --git a/mesonbuild/cmake/interpreter.py b/mesonbuild/cmake/interpreter.py index 291157f2f..ef522dfc3 100644 --- a/mesonbuild/cmake/interpreter.py +++ b/mesonbuild/cmake/interpreter.py @@ -346,7 +346,7 @@ class ConverterTarget: self.override_options += [f'{i}_std={std}'] elif j in {'-fPIC', '-fpic', '-fPIE', '-fpie'}: self.pie = True - elif isinstance(ctgt, ConverterCustomTarget): + elif ctgt is not None: # Sometimes projects pass generated source files as compiler # flags. Add these as generated sources to ensure that the # corresponding custom target is run.2 diff --git a/mesonbuild/compilers/fortran.py b/mesonbuild/compilers/fortran.py index a58667f18..ab2b0bbf3 100644 --- a/mesonbuild/compilers/fortran.py +++ b/mesonbuild/compilers/fortran.py @@ -155,7 +155,7 @@ class FortranCompiler(CLikeCompiler, Compiler): # If no bounds are given, compute them in the limit of int32 maxint = 0x7fffffff minint = -0x80000000 - if not isinstance(low, int) or not isinstance(high, int): + if low is None or high is None: if self._compile_int(f'{expression} >= 0', prefix, extra_args, dependencies): low = cur = 0 while self._compile_int(f'{expression} > {cur}', prefix, extra_args, dependencies): diff --git a/mesonbuild/compilers/mixins/clike.py b/mesonbuild/compilers/mixins/clike.py index bd017f1ff..148faeb7d 100644 --- a/mesonbuild/compilers/mixins/clike.py +++ b/mesonbuild/compilers/mixins/clike.py @@ -453,7 +453,7 @@ class CLikeCompiler(Compiler): # If no bounds are given, compute them in the limit of int32 maxint = 0x7fffffff minint = -0x80000000 - if not isinstance(low, int) or not isinstance(high, int): + if low is None or high is None: if self._compile_int(f'{expression} >= 0', prefix, extra_args, dependencies): low = cur = 0 while self._compile_int(f'{expression} > {cur}', prefix, extra_args, dependencies): diff --git a/mesonbuild/mdist.py b/mesonbuild/mdist.py index 2f4fead6f..06fbbe5f2 100644 --- a/mesonbuild/mdist.py +++ b/mesonbuild/mdist.py @@ -422,8 +422,6 @@ def run(options: argparse.Namespace) -> int: project = cls(dist_name, src_root, bld_root, b.dist_scripts, subprojects, options) names = project.create_dist(archives) - if names is None: - return 1 rc = 0 if not options.no_tests: # Check only one. diff --git a/mesonbuild/modules/dlang.py b/mesonbuild/modules/dlang.py index 9ef099d0f..8ca1c99ff 100644 --- a/mesonbuild/modules/dlang.py +++ b/mesonbuild/modules/dlang.py @@ -93,10 +93,7 @@ class DlangModule(ExtensionModule): ret, res = self._call_dubbin(['describe', name]) if ret == 0: version = dep.get_version() - if version is None: - data[name] = '' - else: - data[name] = version + data[name] = version config[key] = data else: def _do_validate(v: object) -> _JSONTypes: