flake8: Perform suggested whitespace/formatting changes

This only touches newlines, spaces, and (occaisionally) commas. Anything else is left for another commit.
Charadon · Sep 21, 2017 · bb25260 · bb25260
1 parent 751d59d
commit bb25260
Show file tree

Hide file tree

Showing 12 changed files with 101 additions and 98 deletions.
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
@@ -83,10 +83,9 @@ def add_item(self, name, elems):
 
     def write(self, outfile):
         self.check_outputs()
-        line = 'build %s: %s %s' % (
-            ' '.join([ninja_quote(i) for i in self.outfilenames]),
-            self.rule,
-            ' '.join([ninja_quote(i) for i in self.infilenames]))
+        line = 'build %s: %s %s' % (' '.join([ninja_quote(i) for i in self.outfilenames]),
+                                    self.rule,
+                                    ' '.join([ninja_quote(i) for i in self.infilenames]))
         if len(self.deps) > 0:
             line += ' | ' + ' '.join([ninja_quote(x) for x in self.deps])
         if len(self.orderdeps) > 0:
@@ -721,8 +720,7 @@ def generate_target_install(self, d):
                     # On toolchains/platforms that use an import library for
                     # linking (separate from the shared library with all the
                     # code), we need to install that too (dll.a/.lib).
-                    if (isinstance(t, build.SharedLibrary) or
-                        isinstance(t, build.Executable)) and t.get_import_filename():
+                    if (isinstance(t, build.SharedLibrary) or isinstance(t, build.Executable)) and t.get_import_filename():
                         if custom_install_dir:
                             # If the DLL is installed into a custom directory,
                             # install the import library into the same place so
@@ -856,8 +854,9 @@ def generate_tests(self, outfile):
         self.create_target_alias('meson-test', outfile)
 
         # And then benchmarks.
-        cmd = self.environment.get_build_command(True) + ['test', '--benchmark', '--logbase',
-               'benchmarklog', '--num-processes=1', '--no-rebuild']
+        cmd = self.environment.get_build_command(True) + [
+            'test', '--benchmark', '--logbase',
+            'benchmarklog', '--num-processes=1', '--no-rebuild']
         elem = NinjaBuildElement(self.all_outputs, 'meson-benchmark', 'CUSTOM_COMMAND', ['all', 'PHONY'])
         elem.add_item('COMMAND', cmd)
         elem.add_item('DESC', 'Running benchmark suite.')
@@ -1576,9 +1575,10 @@ def generate_rust_compile_rules(self, compiler, outfile):
     def generate_swift_compile_rules(self, compiler, outfile):
         rule = 'rule %s_COMPILER\n' % compiler.get_language()
         full_exe = [ninja_quote(x) for x in self.environment.get_build_command()] + [
-                    '--internal',
-                    'dirchanger',
-                    '$RUNDIR']
+            '--internal',
+            'dirchanger',
+            '$RUNDIR',
+        ]
         invoc = (' '.join(full_exe) + ' ' +
                  ' '.join(ninja_quote(i) for i in compiler.get_exelist()))
         command = ' command = %s $ARGS $in\n' % invoc
@@ -2527,10 +2527,11 @@ def get_user_option_args(self):
     def generate_dist(self, outfile):
         elem = NinjaBuildElement(self.all_outputs, 'meson-dist', 'CUSTOM_COMMAND', 'PHONY')
         elem.add_item('DESC', 'Creating source packages')
-        elem.add_item('COMMAND', self.environment.get_build_command() +
-            ['--internal', 'dist',
-             self.environment.source_dir,
-             self.environment.build_dir] + self.environment.get_build_command())
+        elem.add_item('COMMAND', self.environment.get_build_command() + [
+            '--internal', 'dist',
+            self.environment.source_dir,
+            self.environment.build_dir,
+        ] + self.environment.get_build_command())
         elem.add_item('pool', 'console')
         elem.write(outfile)
         # Alias that runs the target defined above

diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py
@@ -383,8 +383,7 @@ def gen_run_target_vcxproj(self, target, ofname, guid):
         cmd = [sys.executable, os.path.join(self.environment.get_script_dir(), 'commandrunner.py'),
                self.environment.get_build_dir(),
                self.environment.get_source_dir(),
-               self.get_target_dir(target)] + \
-               self.environment.get_build_command()
+               self.get_target_dir(target)] + self.environment.get_build_command()
         for i in cmd_raw:
             if isinstance(i, build.BuildTarget):
                 cmd.append(os.path.join(self.environment.get_build_dir(), self.get_target_filename(i)))
@@ -926,8 +925,7 @@ def gen_vcxproj(self, target, ofname, guid):
         ofile.text = '$(OutDir)%s' % 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) or isinstance(target, 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/compilers/c.py b/mesonbuild/compilers/c.py
@@ -1025,5 +1025,3 @@ def get_instruction_set_args(self, instruction_set):
             # and the can not be called.
             return None
         return vs32_instruction_set_args.get(instruction_set, None)
-
-
diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py
@@ -252,7 +252,7 @@ def is_library(fname):
                              'avx': ['/arch:AVX'],
                              'avx2': ['/arch:AVX2'],
                              'neon': None,
-}
+                             }
 
 # The 64 bit compiler defaults to /arch:avx.
 vs64_instruction_set_args = {'mmx': ['/arch:AVX'],

diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
@@ -1028,7 +1028,6 @@ def get_supported_arguments_method(self, args, kwargs):
             h)
         return result
 
-
     def first_supported_argument_method(self, args, kwargs):
         for i in mesonlib.stringlistify(args):
             if self.compiler.has_argument(i, self.environment):
@@ -1245,48 +1244,50 @@ def get_cross_property_method(self, args, kwargs):
 
 pch_kwargs = set(['c_pch', 'cpp_pch'])
 
-lang_arg_kwargs = set(['c_args',
-                       'cpp_args',
-                       'd_args',
-                       'd_import_dirs',
-                       'd_unittest',
-                       'd_module_versions',
-                       'fortran_args',
-                       'java_args',
-                       'objc_args',
-                       'objcpp_args',
-                       'rust_args',
-                       'vala_args',
-                       'cs_args',
-                   ])
+lang_arg_kwargs = set([
+    'c_args',
+    'cpp_args',
+    'd_args',
+    'd_import_dirs',
+    'd_unittest',
+    'd_module_versions',
+    'fortran_args',
+    'java_args',
+    'objc_args',
+    'objcpp_args',
+    'rust_args',
+    'vala_args',
+    'cs_args',
+])
 
 vala_kwargs = set(['vala_header', 'vala_gir', 'vala_vapi'])
 rust_kwargs = set(['rust_crate_type'])
 cs_kwargs = set(['resources', 'cs_args'])
 
-buildtarget_kwargs = set(['build_by_default',
-                          'build_rpath',
-                          'dependencies',
-                          'extra_files',
-                          'gui_app',
-                          'link_with',
-                          'link_whole',
-                          'link_args',
-                          'link_depends',
-                          'implicit_include_directories',
-                          'include_directories',
-                          'install',
-                          'install_rpath',
-                          'install_dir',
-                          'name_prefix',
-                          'name_suffix',
-                          'native',
-                          'objects',
-                          'override_options',
-                          'pic',
-                          'sources',
-                          'vs_module_defs',
-                      ])
+buildtarget_kwargs = set([
+    'build_by_default',
+    'build_rpath',
+    'dependencies',
+    'extra_files',
+    'gui_app',
+    'link_with',
+    'link_whole',
+    'link_args',
+    'link_depends',
+    'implicit_include_directories',
+    'include_directories',
+    'install',
+    'install_rpath',
+    'install_dir',
+    'name_prefix',
+    'name_suffix',
+    'native',
+    'objects',
+    'override_options',
+    'pic',
+    'sources',
+    'vs_module_defs',
+])
 
 build_target_common_kwargs = (
     buildtarget_kwargs |
@@ -2013,7 +2014,7 @@ def func_find_program(self, node, args, kwargs):
             if not isinstance(use_native, bool):
                 raise InvalidArguments('Argument to "native" must be a boolean.')
             if not use_native:
-                 progobj = self.program_from_cross_file(args)
+                progobj = self.program_from_cross_file(args)
         if progobj is None:
             progobj = self.program_from_system(args)
         if required and (progobj is None or not progobj.found()):

diff --git a/mesonbuild/mesonmain.py b/mesonbuild/mesonmain.py
@@ -122,11 +122,11 @@ def validate_dirs(self, dir1, dir2, handshake):
         if os.path.exists(priv_dir):
             if not handshake:
                 print('Directory already configured, exiting Meson. Just run your build command\n'
-                '(e.g. ninja) and Meson will regenerate as necessary. If ninja fails, run ninja\n'
-                'reconfigure to force Meson to regenerate.\n'
-                '\nIf build failures persist, manually wipe your build directory to clear any\n'
-                'stored system data.\n'
-                '\nTo change option values, run meson configure instead.')
+                      '(e.g. ninja) and Meson will regenerate as necessary. If ninja fails, run ninja\n'
+                      'reconfigure to force Meson to regenerate.\n'
+                      '\nIf build failures persist, manually wipe your build directory to clear any\n'
+                      'stored system data.\n'
+                      '\nTo change option values, run meson configure instead.')
                 sys.exit(0)
         else:
             if handshake:

diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
@@ -697,18 +697,22 @@ def yelp(self, state, args, kwargs):
             args.append('--langs=' + '@@'.join(langs))
         inscript = build.RunScript(script, args)
 
-        potargs = state.environment.get_build_command() + ['--internal', 'yelphelper', 'pot',
-                   '--subdir=' + state.subdir,
-                   '--id=' + project_id,
-                   '--sources=' + source_str]
+        potargs = state.environment.get_build_command() + [
+            '--internal', 'yelphelper', 'pot',
+            '--subdir=' + state.subdir,
+            '--id=' + project_id,
+            '--sources=' + source_str,
+        ]
         pottarget = build.RunTarget('help-' + project_id + '-pot', potargs[0],
                                     potargs[1:], [], state.subdir)
 
-        poargs = state.environment.get_build_command() + ['--internal', 'yelphelper', 'update-po',
-                  '--subdir=' + state.subdir,
-                  '--id=' + project_id,
-                  '--sources=' + source_str,
-                  '--langs=' + '@@'.join(langs)]
+        poargs = state.environment.get_build_command() + [
+            '--internal', 'yelphelper', 'update-po',
+            '--subdir=' + state.subdir,
+            '--id=' + project_id,
+            '--sources=' + source_str,
+            '--langs=' + '@@'.join(langs),
+        ]
         potarget = build.RunTarget('help-' + project_id + '-update-po', poargs[0],
                                    poargs[1:], [], state.subdir)
 

diff --git a/mesonbuild/modules/i18n.py b/mesonbuild/modules/i18n.py
@@ -72,8 +72,10 @@ def merge_file(self, state, args, kwargs):
         datadirs = self._get_data_dirs(state, mesonlib.stringlistify(kwargs.pop('data_dirs', [])))
         datadirs = '--datadirs=' + ':'.join(datadirs) if datadirs else None
 
-        command = state.environment.get_build_command() + ['--internal', 'msgfmthelper',
-                   '@INPUT@', '@OUTPUT@', file_type, podir]
+        command = state.environment.get_build_command() + [
+            '--internal', 'msgfmthelper',
+            '@INPUT@', '@OUTPUT@', file_type, podir
+        ]
         if datadirs:
             command.append(datadirs)
 

diff --git a/mesonrewriter.py b/mesonrewriter.py
@@ -30,4 +30,3 @@
     print('Warning: This executable is deprecated. Use "meson rewrite" instead.',
           file=sys.stderr)
     sys.exit(mesonmain.run(['rewrite'] + sys.argv[1:]))
-
diff --git a/msi/createmsi.py b/msi/createmsi.py
@@ -56,7 +56,7 @@ def __init__(self):
                 'Title': 'Meson',
                 'Description': 'Meson executables',
                 'Level': '1',
-                'Absent': 'disallow', 
+                'Absent': 'disallow',
             },
             self.staging_dirs[1]: {
                 'Id': 'NinjaProgram',
@@ -109,7 +109,7 @@ def generate_files(self):
             'Language': '1033',
             'Codepage':  '1252',
             'Version': self.version,
-            })
+        })
 
         package = ET.SubElement(product, 'Package',  {
             'Id': '*',
@@ -121,33 +121,34 @@ def generate_files(self):
             'Languages': '1033',
             'Compressed': 'yes',
             'SummaryCodepage': '1252',
-            })
+        })
 
         if self.bytesize == 64:
             package.set('Platform', 'x64')
         ET.SubElement(product, 'Media', {
             'Id': '1',
             'Cabinet': 'meson.cab',
             'EmbedCab': 'yes',
-            })
+        })
         targetdir = ET.SubElement(product, 'Directory', {
             'Id': 'TARGETDIR',
             'Name': 'SourceDir',
-            })
+        })
         progfiledir = ET.SubElement(targetdir, 'Directory', {
-            'Id' : self.progfile_dir,
-            })
+            'Id': self.progfile_dir,
+        })
         installdir = ET.SubElement(progfiledir, 'Directory', {
             'Id': 'INSTALLDIR',
-            'Name': 'Meson'})
+            'Name': 'Meson',
+        })
 
         ET.SubElement(product, 'Property', {
             'Id': 'WIXUI_INSTALLDIR',
             'Value': 'INSTALLDIR',
-            })
+        })
         ET.SubElement(product, 'UIRef', {
             'Id': 'WixUI_FeatureTree',
-            })
+        })
         for sd in self.staging_dirs:
             assert(os.path.isdir(sd))
         top_feature = ET.SubElement(product, 'Feature', {
@@ -157,15 +158,15 @@ def generate_files(self):
             'Display': 'expand',
             'Level': '1',
             'ConfigurableDirectory': 'INSTALLDIR',
-            })
+        })
         for sd in self.staging_dirs:
             nodes = {}
             for root, dirs, files in os.walk(sd):
                 cur_node = Node(dirs, files)
                 nodes[root] = cur_node
             self.create_xml(nodes, sd, installdir, sd)
             self.build_features(nodes, top_feature, sd)
-        ET.ElementTree(self.root).write(self.main_xml, encoding='utf-8',xml_declaration=True)
+        ET.ElementTree(self.root).write(self.main_xml, encoding='utf-8', xml_declaration=True)
         # ElementTree can not do prettyprinting so do it manually
         import xml.dom.minidom
         doc = xml.dom.minidom.parse(self.main_xml)
@@ -177,8 +178,7 @@ def build_features(self, nodes, top_feature, staging_dir):
         for component_id in self.feature_components[staging_dir]:
             ET.SubElement(feature, 'ComponentRef', {
                 'Id': component_id,
-                })
-
+            })
 
     def create_xml(self, nodes, current_dir, parent_xml_node, staging_dir):
         cur_node = nodes[current_dir]
@@ -187,7 +187,7 @@ def create_xml(self, nodes, current_dir, parent_xml_node, staging_dir):
             comp_xml_node = ET.SubElement(parent_xml_node, 'Component', {
                 'Id': component_id,
                 'Guid': gen_guid(),
-                })
+            })
             self.feature_components[staging_dir].append(component_id)
             if self.bytesize == 64:
                 comp_xml_node.set('Win64', 'yes')
@@ -208,14 +208,14 @@ def create_xml(self, nodes, current_dir, parent_xml_node, staging_dir):
                     'Id': file_id,
                     'Name': f,
                     'Source': os.path.join(current_dir, f),
-                    })
+                })
 
         for dirname in cur_node.dirs:
             dir_id = os.path.join(current_dir, dirname).replace('\\', '_').replace('/', '_')
             dir_node = ET.SubElement(parent_xml_node, 'Directory', {
                 'Id': dir_id,
                 'Name': dirname,
-                })
+            })
             self.create_xml(nodes, os.path.join(current_dir, dirname), dir_node, staging_dir)
 
     def build_package(self):

diff --git a/run_unittests.py b/run_unittests.py
@@ -1946,7 +1946,7 @@ def test_cross_find_program(self):
 endian = 'little'
 ''' % os.path.join(testdir, 'some_cross_tool.py'))
         crossfile.flush()
-        self.init(testdir, ['--cross-file='+crossfile.name])
+        self.init(testdir, ['--cross-file=' + crossfile.name])
 
     def test_reconfigure(self):
         testdir = os.path.join(self.unit_test_dir, '13 reconfigure')
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1025,5 +1025,3 @@ def get_instruction_set_args(self, instruction_set):
		# and the can not be called.
		return None
		return vs32_instruction_set_args.get(instruction_set, None)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -30,4 +30,3 @@
		print('Warning: This executable is deprecated. Use "meson rewrite" instead.',
		file=sys.stderr)
		sys.exit(mesonmain.run(['rewrite'] + sys.argv[1:]))