Merge pull request #5311 from mensinda/flake8Plugins

Added flake8 plugins and some code fixes

4 files changed, 16 insertions, 14 deletions

diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py
index e40bcbc..d0b4bb5 100644
--- a/mesonbuild/backend/backends.py
+++ b/mesonbuild/backend/backends.py
@@ -322,12 +322,14 @@ class Backend:
                 raise MesonException('Unknown data type in object list.')
         return obj_list
 
-    def serialize_executable(self, tname, exe, cmd_args, workdir, env={},
+    def serialize_executable(self, tname, exe, cmd_args, workdir, env=None,
                              extra_paths=None, capture=None):
         '''
         Serialize an executable for running with a generator or a custom target
         '''
         import hashlib
+        if env is None:
+            env = {}
         if extra_paths is None:
             # The callee didn't check if we needed extra paths, so check it here
             if mesonlib.is_windows() or mesonlib.is_cygwin():
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
index 9a6fdad..7eafcad 100644
--- a/mesonbuild/backend/ninjabackend.py
+++ b/mesonbuild/backend/ninjabackend.py
@@ -406,9 +406,9 @@ int dummy;
             }
         }
         '''
-        id = target.get_id()
+        tid = target.get_id()
         lang = comp.get_language()
-        tgt = self.introspection_data[id]
+        tgt = self.introspection_data[tid]
         # Find an existing entry or create a new one
         id_hash = (lang, tuple(parameters))
         src_block = tgt.get(id_hash, None)
@@ -520,7 +520,7 @@ int dummy;
         # This will be set as dependencies of all the target's sources. At the
         # same time, also deal with generated sources that need to be compiled.
         generated_source_files = []
-        for rel_src, gensrc in generated_sources.items():
+        for rel_src in generated_sources.keys():
             dirpart, fnamepart = os.path.split(rel_src)
             raw_src = File(True, dirpart, fnamepart)
             if self.environment.is_source(rel_src) and not self.environment.is_header(rel_src):
@@ -585,7 +585,7 @@ int dummy;
             obj_list.append(self.generate_single_compile(target, src, 'vala', [], header_deps))
 
         # Generate compile targets for all the pre-existing sources for this target
-        for f, src in target_sources.items():
+        for src in target_sources.values():
             if not self.environment.is_header(src):
                 if self.environment.is_llvm_ir(src):
                     obj_list.append(self.generate_llvm_ir_compile(target, src))
@@ -912,7 +912,7 @@ int dummy;
         # Add possible java generated files to src list
         generated_sources = self.get_target_generated_sources(target)
         gen_src_list = []
-        for rel_src, gensrc in generated_sources.items():
+        for rel_src in generated_sources.keys():
             dirpart, fnamepart = os.path.split(rel_src)
             raw_src = File(True, dirpart, fnamepart)
             if rel_src.endswith('.java'):
@@ -1041,7 +1041,7 @@ int dummy;
     def generate_single_java_compile(self, src, target, compiler, args):
         deps = [os.path.join(self.get_target_dir(l), l.get_filename()) for l in target.link_targets]
         generated_sources = self.get_target_generated_sources(target)
-        for rel_src, gensrc in generated_sources.items():
+        for rel_src in generated_sources.keys():
             if rel_src.endswith('.java'):
                 deps.append(rel_src)
         rel_src = src.rel_to_builddir(self.build_to_src)
@@ -1227,7 +1227,7 @@ int dummy;
                 if len(target.install_dir) > 3 and target.install_dir[3] is True:
                     target.install_dir[3] = os.path.join(self.environment.get_datadir(), 'gir-1.0')
         # Detect gresources and add --gresources arguments for each
-        for (gres, gensrc) in other_src[1].items():
+        for gensrc in other_src[1].values():
             if isinstance(gensrc, modules.GResourceTarget):
                 gres_xml, = self.get_custom_target_sources(gensrc)
                 args += ['--gresources=' + gres_xml]
@@ -2751,7 +2751,7 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=47485'''))
             return super().get_introspection_data(target_id, target)
 
         result = []
-        for _, i in self.introspection_data[target_id].items():
+        for i in self.introspection_data[target_id].values():
             result += [i]
         return result
 
diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py
index afbd59b..d25798e 100644
--- a/mesonbuild/backend/vs2010backend.py
+++ b/mesonbuild/backend/vs2010backend.py
@@ -312,7 +312,7 @@ class Vs2010Backend(backends.Backend):
                 target = self.build.targets[prj[0]]
                 lang = 'default'
                 if hasattr(target, 'compilers') and target.compilers:
-                    for (lang_out, _) in target.compilers.items():
+                    for lang_out in target.compilers.keys():
                         lang = lang_out
                         break
                 prj_line = prj_templ % (
@@ -386,7 +386,7 @@ class Vs2010Backend(backends.Backend):
                 for p in projlist:
                     if p[1].parent != PurePath('.'):
                         ofile.write("\t\t{%s} = {%s}\n" % (p[2], self.subdirs[p[1].parent][0]))
-                for (_, subdir) in self.subdirs.items():
+                for subdir in self.subdirs.values():
                     if subdir[1]:
                         ofile.write("\t\t{%s} = {%s}\n" % (subdir[0], subdir[1]))
                 ofile.write('\tEndGlobalSection\n')
@@ -463,7 +463,7 @@ class Vs2010Backend(backends.Backend):
 
     def add_target_deps(self, root, target):
         target_dict = {target.get_id(): target}
-        for name, dep in self.get_target_deps(target_dict).items():
+        for dep in self.get_target_deps(target_dict).values():
             if dep.get_id() in self.handled_target_deps[target.get_id()]:
                 # This dependency was already handled manually.
                 continue
diff --git a/mesonbuild/backend/xcodebackend.py b/mesonbuild/backend/xcodebackend.py
index 7dd3674..be22c78 100644
--- a/mesonbuild/backend/xcodebackend.py
+++ b/mesonbuild/backend/xcodebackend.py
@@ -345,7 +345,7 @@ class XCodeBackend(backends.Backend):
         self.ofile.write('/* End PBXFileReference section */\n')
 
     def generate_pbx_frameworks_buildphase(self):
-        for tname, t in self.build.targets.items():
+        for t in self.build.targets.values():
             self.ofile.write('\n/* Begin PBXFrameworksBuildPhase section */\n')
             self.write_line('%s /* %s */ = {\n' % (t.buildphasemap['Frameworks'], 'Frameworks'))
             self.indent_level += 1
@@ -587,7 +587,7 @@ class XCodeBackend(backends.Backend):
 
     def generate_pbx_sources_build_phase(self):
         self.ofile.write('\n/* Begin PBXSourcesBuildPhase section */\n')
-        for name, phase_id in self.source_phase.items():
+        for name in self.source_phase.keys():
             t = self.build.targets[name]
             self.write_line('%s /* Sources */ = {' % (t.buildphasemap[name]))
             self.indent_level += 1