diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2022-09-07 15:38:36 -0700 |
|---|---|---|
| committer | Eli Schwartz <eschwartz@archlinux.org> | 2022-10-04 00:33:14 -0400 |
| commit | df1b95cf2b015fc5b756609f2cae1e0dc7176702 (patch) | |
| tree | 71acad3b558074c4ef76724c39721a561ddd2c53 | |
| parent | a72840cd2e27bf18b88cf95ef6a9e5e3ab05427d (diff) | |
| download | meson-df1b95cf2b015fc5b756609f2cae1e0dc7176702.tar.gz | |
pylint: enable consider-merging-isinstance
| -rw-r--r-- | .pylintrc | 1 | ||||
| -rw-r--r-- | mesonbuild/backend/vs2010backend.py | 2 | ||||
| -rw-r--r-- | mesonbuild/build.py | 2 | ||||
| -rw-r--r-- | mesonbuild/modules/hotdoc.py | 2 |
4 files changed, 3 insertions, 4 deletions
@@ -12,7 +12,6 @@ disable= attribute-defined-outside-init, broad-except, cell-var-from-loop, - consider-merging-isinstance, consider-using-f-string, consider-using-with, cyclic-import, diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index 4171ce2df..e747dfa7d 100644 --- a/mesonbuild/backend/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -1309,7 +1309,7 @@ class Vs2010Backend(backends.Backend): ofile.text = f'$(OutDir){target.get_filename()}' subsys = ET.SubElement(link, 'SubSystem') subsys.text = subsystem - if (isinstance(target, build.SharedLibrary) or isinstance(target, build.Executable)) and target.get_import_filename(): + if isinstance(target, (build.SharedLibrary, build.Executable)) and target.get_import_filename(): # DLLs built with MSVC always have an import library except when # they're data-only DLLs, but we don't support those yet. ET.SubElement(link, 'ImportLibrary').text = target.get_import_filename() diff --git a/mesonbuild/build.py b/mesonbuild/build.py index c39726c75..bf8707195 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -828,7 +828,7 @@ class BuildTarget(Target): # the languages of those libraries as well. if self.link_targets or self.link_whole_targets: for t in itertools.chain(self.link_targets, self.link_whole_targets): - if isinstance(t, CustomTarget) or isinstance(t, CustomTargetIndex): + if isinstance(t, (CustomTarget, CustomTargetIndex)): continue # We can't know anything about these. for name, compiler in t.compilers.items(): if name in link_langs and name not in self.compilers: diff --git a/mesonbuild/modules/hotdoc.py b/mesonbuild/modules/hotdoc.py index d2445db0f..d17db774c 100644 --- a/mesonbuild/modules/hotdoc.py +++ b/mesonbuild/modules/hotdoc.py @@ -207,7 +207,7 @@ class HotdocTargetBuilder: self.add_include_path(os.path.join(self.builddir, dep.hotdoc_conf.subdir)) self.cmd += ['--extra-assets=' + p for p in dep.extra_assets] self.add_extension_paths(dep.extra_extension_paths) - elif isinstance(dep, build.CustomTarget) or isinstance(dep, build.BuildTarget): + elif isinstance(dep, (build.CustomTarget, build.BuildTarget)): self._dependencies.append(dep) elif isinstance(dep, build.CustomTargetIndex): self._dependencies.append(dep.target) |