From a2321b24f6ce0e7832f18c39d4de69d0236ba145 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 27 Aug 2016 08:47:29 -0400 Subject: Flatten isinstance calls. (#715) That is, isinstance(x, y) or isinstance(x, z) can be flattened with a tuple to isinstance(x, (y, z)). --- mesonbuild/backend/backends.py | 3 +-- mesonbuild/backend/ninjabackend.py | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'mesonbuild/backend') diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index fbc5079..d81ff64 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -367,8 +367,7 @@ class Backend(): def build_target_link_arguments(self, compiler, deps): args = [] for d in deps: - if not isinstance(d, build.StaticLibrary) and\ - not isinstance(d, build.SharedLibrary): + if not isinstance(d, (build.StaticLibrary, build.SharedLibrary)): raise RuntimeError('Tried to link with a non-library target "%s".' % d.get_basename()) if isinstance(compiler, compilers.LLVMDCompiler): args.extend(['-L', self.get_target_filename_for_linking(d)]) diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 7855729..5c6b8eb 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -1492,9 +1492,7 @@ rule FORTRAN_DEP_HACK else: raise build.InvalidArguments('Invalid source type.') abs_src = os.path.join(self.environment.get_build_dir(), rel_src) - if isinstance(src, RawFilename): - src_filename = src.fname - elif isinstance(src, File): + if isinstance(src, (RawFilename, File)): src_filename = src.fname elif os.path.isabs(src): src_filename = os.path.basename(src) -- cgit v1.1