fix various flake8 whitespace errors

mesonbuild/_typing.py

@@ -55,7 +55,7 @@ class ImmutableListProtocol(Protocol[T]):
     def __iter__(self) -> typing.Iterator[T]: ...
 
     @typing.overload
-    def __getitem__(self, index: int) -> T:...
+    def __getitem__(self, index: int) -> T: ...
     @typing.overload
     def __getitem__(self, index: slice) -> typing.List[T]: ...
 

mesonbuild/backend/ninjabackend.py

@@ -824,7 +824,7 @@ def generate_target(self, target):
                 o, s = self.generate_llvm_ir_compile(target, src)
             else:
                 o, s = self.generate_single_compile(target, src, True,
-                                                 order_deps=header_deps)
+                                                    order_deps=header_deps)
             compiled_sources.append(s)
             source2object[s] = o
             obj_list.append(o)
@@ -908,7 +908,7 @@ def should_use_dyndeps_for_target(self, target: 'build.BuildTarget') -> bool:
         if cpp.get_id() != 'msvc':
             return False
         cppversion = self.environment.coredata.options[OptionKey('std', machine=target.for_machine, lang='cpp')].value
-        if  cppversion not in ('latest', 'c++latest', 'vc++latest'):
+        if cppversion not in ('latest', 'c++latest', 'vc++latest'):
             return False
         if not mesonlib.current_vs_supports_modules():
             return False
@@ -1619,7 +1619,7 @@ def generate_cython_transpile(self, target: build.BuildTarget) -> \
         for gen in target.get_generated_sources():
             for ssrc in gen.get_outputs():
                 if isinstance(gen, GeneratedList):
-                    ssrc = os.path.join(self.get_target_private_dir(target) , ssrc)
+                    ssrc = os.path.join(self.get_target_private_dir(target), ssrc)
                 else:
                     ssrc = os.path.join(gen.get_subdir(), ssrc)
                 if ssrc.endswith('.pyx'):
@@ -2219,7 +2219,7 @@ def generate_genlist_for_target(self, genlist, target):
                 args = [x.replace('@DEPFILE@', depfile) for x in base_args]
             args = [x.replace("@INPUT@", infilename).replace('@OUTPUT@', sole_output)
                     for x in args]
-            args =  self.replace_outputs(args, self.get_target_private_dir(target), outfilelist)
+            args = self.replace_outputs(args, self.get_target_private_dir(target), outfilelist)
             # We have consumed output files, so drop them from the list of remaining outputs.
             if len(generator.outputs) > 1:
                 outfilelist = outfilelist[len(generator.outputs):]
@@ -2602,8 +2602,8 @@ def generate_single_compile(self, target, src, is_generated=False, header_deps=N
                         crstr = self.get_rule_suffix(target.for_machine)
                         depelem = NinjaBuildElement(self.all_outputs,
                                                     modfile,
-                                                     'FORTRAN_DEP_HACK' + crstr,
-                                                      rel_obj)
+                                                    'FORTRAN_DEP_HACK' + crstr,
+                                                    rel_obj)
                         self.add_build(depelem)
             commands += compiler.get_module_outdir_args(self.get_target_private_dir(target))
 

mesonbuild/backend/xcodebackend.py

@@ -256,7 +256,7 @@ def object_filename_from_source(self, target, source):
         obj_path = f'{project}.build/{buildtype}/{tname}.build/Objects-normal/{arch}/{stem}.o'
         return obj_path
 
-    def get_extracted_obj_paths(self, target: build.BuildTarget, outputs: T.List[str])-> T.List[str]:
+    def get_extracted_obj_paths(self, target: build.BuildTarget, outputs: T.List[str]) -> T.List[str]:
         return outputs
 
     def generate(self):
@@ -1269,7 +1269,7 @@ def generate_single_generator_phase(self, tname, t, genlist, generator_id, objec
                 else:
                     q.append(c)
             quoted_cmds.append(' '.join(q))
-        cmdstr = '"'  + ' && '.join(quoted_cmds) + '"'
+        cmdstr = '"' + ' && '.join(quoted_cmds) + '"'
         gen_dict.add_item('shellScript', cmdstr)
         gen_dict.add_item('showEnvVarsInLog', 0)
 

mesonbuild/build.py

@@ -636,7 +636,7 @@ def process_kwargs_base(self, kwargs: T.Dict[str, T.Any]) -> None:
 
     @staticmethod
     def parse_overrides(kwargs: T.Dict[str, T.Any]) -> T.Dict[OptionKey, str]:
-        opts =  kwargs.get('override_options', [])
+        opts = kwargs.get('override_options', [])
 
         # In this case we have an already parsed and ready to go dictionary
         # provided by typed_kwargs
@@ -907,10 +907,10 @@ def process_compilers(self):
                 else:
                     logger_fun = mlog.debug
                 logger_fun(comp.get_display_language(), 'compiler for the', self.for_machine.get_lower_case_name(), 'machine:',
-                        mlog.bold(' '.join(comp.get_exelist())), comp.get_version_string())
+                           mlog.bold(' '.join(comp.get_exelist())), comp.get_version_string())
                 if comp.linker is not None:
                     logger_fun(comp.get_display_language(), 'linker for the', self.for_machine.get_lower_case_name(), 'machine:',
-                            mlog.bold(' '.join(comp.linker.get_exelist())), comp.linker.id, comp.linker.version)
+                               mlog.bold(' '.join(comp.linker.get_exelist())), comp.linker.id, comp.linker.version)
                 if comp is None:
                     raise MesonException(f'Cannot find required compiler {value}')
                 self.compilers[value] = comp

mesonbuild/compilers/c.py

@@ -434,9 +434,9 @@ def __init__(self, exelist: T.List[str], version: str, for_machine: MachineChoic
     def get_options(self) -> 'KeyedOptionDictType':
         opts = super().get_options()
         c_stds = ['c89', 'c99']
-                  # Need to have these to be compatible with projects
-                  # that set c_std to e.g. gnu99.
-                  # https://github.com/mesonbuild/meson/issues/7611
+        # Need to have these to be compatible with projects
+        # that set c_std to e.g. gnu99.
+        # https://github.com/mesonbuild/meson/issues/7611
         g_stds = ['gnu89', 'gnu90', 'gnu9x', 'gnu99']
         if version_compare(self.version, self._C11_VERSION):
             c_stds += ['c11']

mesonbuild/compilers/cpp.py

@@ -76,8 +76,8 @@ def __init__(self, exelist: T.List[str], version: str, for_machine: MachineChoic
                  full_version: T.Optional[str] = None):
         # If a child ObjCPP class has already set it, don't set it ourselves
         Compiler.__init__(self, exelist, version, for_machine, info,
-                         is_cross=is_cross, linker=linker,
-                         full_version=full_version)
+                          is_cross=is_cross, linker=linker,
+                          full_version=full_version)
         CLikeCompiler.__init__(self, exe_wrapper)
 
     @staticmethod

mesonbuild/compilers/cuda.py

@@ -171,7 +171,7 @@ class CudaCompiler(Compiler):
         '--qpp-config':                         '-qpp-config',                  # 4.2.8.19
     }
     # Reverse map -short to --long options.
-    _FLAG_SHORT2LONG_WITHARGS = {v:k for k,v in _FLAG_LONG2SHORT_WITHARGS.items()}
+    _FLAG_SHORT2LONG_WITHARGS = {v: k for k, v in _FLAG_LONG2SHORT_WITHARGS.items()}
 
     def __init__(self, exelist: T.List[str], version: str, for_machine: MachineChoice,
                  is_cross: bool, exe_wrapper: T.Optional['ExternalProgram'],
@@ -186,7 +186,7 @@ def __init__(self, exelist: T.List[str], version: str, for_machine: MachineChoic
         self.warn_args = {level: self._to_host_flags(flags) for level, flags in host_compiler.warn_args.items()}
 
     @classmethod
-    def _shield_nvcc_list_arg(cls, arg: str, listmode: bool=True) -> str:
+    def _shield_nvcc_list_arg(cls, arg: str, listmode: bool = True) -> str:
         r"""
         Shield an argument against both splitting by NVCC's list-argument
         parse logic, and interpretation by any shell.
@@ -390,11 +390,11 @@ def _to_host_flags(self, flags: T.List[str], phase: _Phase = _Phase.COMPILER) ->
                     val = next(flagit)           # -o something
                 except StopIteration:
                     pass
-            elif flag.split('=',1)[0] in self._FLAG_LONG2SHORT_WITHARGS or \
-                 flag.split('=',1)[0] in self._FLAG_SHORT2LONG_WITHARGS:
+            elif flag.split('=', 1)[0] in self._FLAG_LONG2SHORT_WITHARGS or \
+                 flag.split('=', 1)[0] in self._FLAG_SHORT2LONG_WITHARGS:
                 # This is either -o or a multi-letter flag, and it is receiving its
                 # value after an = sign.
-                flag, val = flag.split('=',1)    # -o=something
+                flag, val = flag.split('=', 1)    # -o=something
             # Some dependencies (e.g., BoostDependency) add unspaced "-isystem/usr/include" arguments
             elif flag.startswith('-isystem'):
                 val = flag[8:].strip()
@@ -427,9 +427,9 @@ def _to_host_flags(self, flags: T.List[str], phase: _Phase = _Phase.COMPILER) ->
             assert val is not None  # Should only trip if there is a missing argument.
 
             # Take care of the various NVCC-supported flags that need special handling.
-            flag = self._FLAG_LONG2SHORT_WITHARGS.get(flag,flag)
+            flag = self._FLAG_LONG2SHORT_WITHARGS.get(flag, flag)
 
-            if   flag in {'-include','-isystem','-I','-L','-l'}:
+            if   flag in {'-include', '-isystem', '-I', '-L', '-l'}:
                 # These flags are known to GCC, but list-valued in NVCC. They potentially
                 # require double-quoting to prevent NVCC interpreting the flags as lists
                 # when GCC would not have done so.

mesonbuild/compilers/detect.py

@@ -211,7 +211,7 @@ def compiler_from_language(env: 'Environment', lang: str, for_machine: MachineCh
     }
     return lang_map[lang](env, for_machine) if lang in lang_map else None
 
-def detect_compiler_for(env: 'Environment', lang: str, for_machine: MachineChoice)-> T.Optional[Compiler]:
+def detect_compiler_for(env: 'Environment', lang: str, for_machine: MachineChoice) -> T.Optional[Compiler]:
     comp = compiler_from_language(env, lang, for_machine)
     if comp is not None:
         assert comp.for_machine == for_machine

mesonbuild/compilers/mixins/c2000.py

@@ -124,6 +124,6 @@ def compute_parameters_with_absolute_paths(self, parameter_list: T.List[str], bu
                 parameter_list[idx] = i[:9] + os.path.normpath(os.path.join(build_dir, i[9:]))
 
         return parameter_list
-    
+
     def get_dependency_gen_args(self, outtarget: str, outfile: str) -> T.List[str]:
         return ['--preproc_with_compile', f'--preproc_dependency={outfile}']

mesonbuild/compilers/mixins/clang.py

@@ -125,7 +125,7 @@ def use_linker_args(cls, linker: str) -> T.List[str]:
 
         # qcld: Qualcomm Snapdragon linker, based on LLVM
         if linker == 'qcld':
-            return  ['-fuse-ld=qcld']
+            return ['-fuse-ld=qcld']
 
         if shutil.which(linker):
             if not shutil.which(linker):

mesonbuild/compilers/mixins/clike.py

@@ -283,7 +283,7 @@ def gen_import_library_args(self, implibname: str) -> T.List[str]:
         return self.linker.import_library_args(implibname)
 
     def _sanity_check_impl(self, work_dir: str, environment: 'Environment',
-                         sname: str, code: str) -> None:
+                           sname: str, code: str) -> None:
         mlog.debug('Sanity testing ' + self.get_display_language() + ' compiler:', ' '.join(self.exelist))
         mlog.debug(f'Is cross compiler: {self.is_cross!s}.')
 
@@ -672,7 +672,7 @@ def get_define(self, dname: str, prefix: str, env: 'Environment',
         #endif
         {delim}\n{dname}'''
         args = self.build_wrapper_args(env, extra_args, dependencies,
-                                             mode=CompileCheckMode.PREPROCESS).to_native()
+                                       mode=CompileCheckMode.PREPROCESS).to_native()
         func = functools.partial(self.cached_compile, code, env.coredata, extra_args=args, mode='preprocess')
         if disable_cache:
             func = functools.partial(self.compile, code, extra_args=args, mode='preprocess', temp_dir=env.scratch_dir)
@@ -1096,7 +1096,7 @@ def _find_library_real(self, libname: str, env: 'Environment', extra_dirs: T.Lis
         return None
 
     def _find_library_impl(self, libname: str, env: 'Environment', extra_dirs: T.List[str],
-                         code: str, libtype: LibType) -> T.Optional[T.List[str]]:
+                           code: str, libtype: LibType) -> T.Optional[T.List[str]]:
         # These libraries are either built-in or invalid
         if libname in self.ignore_libs:
             return []
@@ -1158,7 +1158,7 @@ def _find_framework_real(self, name: str, env: 'Environment', extra_dirs: T.List
         return None
 
     def _find_framework_impl(self, name: str, env: 'Environment', extra_dirs: T.List[str],
-                            allow_system: bool) -> T.Optional[T.List[str]]:
+                             allow_system: bool) -> T.Optional[T.List[str]]:
         if isinstance(extra_dirs, str):
             extra_dirs = [extra_dirs]
         key = (tuple(self.exelist), name, tuple(extra_dirs), allow_system)

mesonbuild/compilers/mixins/visualstudio.py

@@ -161,7 +161,7 @@ def get_compile_only_args(self) -> T.List[str]:
         return ['/c']
 
     def get_no_optimization_args(self) -> T.List[str]:
-        return ['/Od','/Oi-']
+        return ['/Od', '/Oi-']
 
     def sanitizer_compile_args(self, value: str) -> T.List[str]:
         if value == 'none':

mesonbuild/compilers/objcpp.py

@@ -59,7 +59,7 @@ def __init__(self, exelist: T.List[str], version: str, for_machine: MachineChoic
                  linker: T.Optional['DynamicLinker'] = None,
                  full_version: T.Optional[str] = None):
         ObjCPPCompiler.__init__(self, exelist, version, for_machine, is_cross,
-                              info, exe_wrapper, linker=linker, full_version=full_version)
+                                info, exe_wrapper, linker=linker, full_version=full_version)
         GnuCompiler.__init__(self, defines)
         default_warn_args = ['-Wall', '-Winvalid-pch', '-Wnon-virtual-dtor']
         self.warn_args = {'0': [],
@@ -77,7 +77,7 @@ def __init__(self, exelist: T.List[str], version: str, for_machine: MachineChoic
                  linker: T.Optional['DynamicLinker'] = None,
                  full_version: T.Optional[str] = None):
         ObjCPPCompiler.__init__(self, exelist, version, for_machine, is_cross,
-                              info, exe_wrapper, linker=linker, full_version=full_version)
+                                info, exe_wrapper, linker=linker, full_version=full_version)
         ClangCompiler.__init__(self, defines)
         default_warn_args = ['-Wall', '-Winvalid-pch', '-Wnon-virtual-dtor']
         self.warn_args = {'0': [],

mesonbuild/coredata.py

@@ -673,7 +673,7 @@ def clear_deps_cache(self):
         self.deps.build.clear()
 
     def get_nondefault_buildtype_args(self):
-        result= []
+        result = []
         value = self.options[OptionKey('buildtype')].value
         if value == 'plain':
             opt = '0'

mesonbuild/dependencies/dev.py

@@ -211,7 +211,7 @@ def __init__(self, name: str, environment: 'Environment', kwargs: T.Dict[str, T.
         # the C linker works fine if only using the C API.
         super().__init__(name, environment, kwargs, language='cpp')
         self.provided_modules: T.List[str] = []
-        self.required_modules: mesonlib.OrderedSet[str]  = mesonlib.OrderedSet()
+        self.required_modules: mesonlib.OrderedSet[str] = mesonlib.OrderedSet()
         self.module_details:   T.List[str] = []
         if not self.is_found:
             return

mesonbuild/dependencies/misc.py

@@ -480,7 +480,7 @@ def __init__(self, name: str, env: 'Environment', kwargs: T.Dict[str, T.Any]):
         super().__init__(name, env, kwargs)
 
         h = self.clib_compiler.has_header('libintl.h', '', env)
-        self.link_args =  self.clib_compiler.find_library('intl', env, [], self.libtype)
+        self.link_args = self.clib_compiler.find_library('intl', env, [], self.libtype)
 
         if h[0] and self.link_args:
             self.is_found = True

mesonbuild/interpreter/interpreter.py

@@ -619,7 +619,7 @@ def extract_variables(self, kwargs, argname='variables', list_new=False, dict_ne
     @FeatureNewKwargs('declare_dependency', '0.54.0', ['variables'])
     @permittedKwargs({'include_directories', 'link_with', 'sources', 'dependencies',
                       'compile_args', 'link_args', 'link_whole', 'version',
-                      'variables' })
+                      'variables'})
     @noPosargs
     def func_declare_dependency(self, node, args, kwargs):
         version = kwargs.get('version', self.project_version)
@@ -815,7 +815,7 @@ def do_subproject(self, subp_name: str, method: str, kwargs):
         m = ['\nExecuting subproject', mlog.bold(stack)]
         if method != 'meson':
             m += ['method', mlog.bold(method)]
-        mlog.log(*m,'\n', nested=False)
+        mlog.log(*m, '\n', nested=False)
 
         try:
             if method == 'meson':
@@ -1459,7 +1459,7 @@ def program_lookup(self, args, for_machine, required, search_dirs, extra_info):
     def find_program_fallback(self, fallback, args, required, extra_info):
         mlog.log('Fallback to subproject', mlog.bold(fallback), 'which provides program',
                  mlog.bold(' '.join(args)))
-        sp_kwargs = { 'required': required }
+        sp_kwargs = {'required': required}
         self.do_subproject(fallback, 'meson', sp_kwargs)
         return self.program_from_overrides(args, extra_info)
 

mesonbuild/interpreter/primitives/array.py

@@ -34,7 +34,6 @@ def __init__(self, obj: T.List[TYPE_var], interpreter: 'Interpreter') -> None:
             'get': self.get_method,
         })
 
-
         self.trivial_operators.update({
             MesonOperator.EQUALS: (list, lambda x: self.held_object == x),
             MesonOperator.NOT_EQUALS: (list, lambda x: self.held_object != x),

mesonbuild/interpreter/primitives/integer.py

@@ -80,4 +80,3 @@ def op_mod(self, other: int) -> int:
         if other == 0:
             raise InvalidArguments('Tried to divide by 0')
         return self.held_object % other
-

mesonbuild/interpreterbase/baseobjects.py

@@ -42,6 +42,7 @@
 if T.TYPE_CHECKING:
     from typing_extensions import Protocol
     __T = T.TypeVar('__T', bound=TYPE_var, contravariant=True)
+
     class OperatorCall(Protocol[__T]):
         def __call__(self, other: __T) -> TYPE_var: ...
 

mesonbuild/interpreterbase/decorators.py

@@ -267,7 +267,7 @@ def wrapper(*wrapped_args: T.Any, **wrapped_kwargs: T.Any) -> T.Any:
                 nargs[i] = tuple(pos)
             elif optargs:
                 if num_args < num_types + len(optargs):
-                    diff =  num_types + len(optargs) - num_args
+                    diff = num_types + len(optargs) - num_args
                     nargs[i] = tuple(list(args) + [None] * diff)
                 else:
                     nargs[i] = args
@@ -297,7 +297,7 @@ class ContainerTypeInfo:
     """
 
     def __init__(self, container: T.Type, contains: T.Union[T.Type, T.Tuple[T.Type, ...]], *,
-                 pairs: bool = False, allow_empty: bool = True) :
+                 pairs: bool = False, allow_empty: bool = True):
         self.container = container
         self.contains = contains
         self.pairs = pairs