Fix various flake8 indentation reports

$ flake8 | grep -E '(E123|E127|E128)'
./run_unittests.py:1358:37: E127 continuation line over-indented for visual indent
./run_unittests.py:1360:37: E127 continuation line over-indented for visual indent
./mesonbuild/minit.py:311:66: E128 continuation line under-indented for visual indent
./mesonbuild/minit.py:312:66: E128 continuation line under-indented for visual indent
./mesonbuild/minit.py:313:66: E128 continuation line under-indented for visual indent
./mesonbuild/compilers/cpp.py:115:63: E127 continuation line over-indented for visual indent
./msi/createmsi.py:156:13: E123 closing bracket does not match indentation of opening bracket's line
./msi/createmsi.py:188:13: E123 closing bracket does not match indentation of opening bracket's line
pull/3171/head
Jon Turney 7 years ago
parent b8b23f4c50
commit 2f6ed47077
  1. 2
      mesonbuild/compilers/cpp.py
  2. 6
      mesonbuild/minit.py
  3. 4
      msi/createmsi.py
  4. 4
      run_unittests.py

@ -112,7 +112,7 @@ class GnuCPPCompiler(GnuCompiler, CPPCompiler):
if self.gcc_type == GCC_MINGW:
opts.update({
'cpp_winlibs': coredata.UserArrayOption('cpp_winlibs', 'Standard Win libraries to link against',
gnu_winlibs), })
gnu_winlibs), })
return opts
def get_option_compile_args(self, options):

@ -308,9 +308,9 @@ def create_exe_cpp_sample(project_name, project_version):
source_name = lowercase_token + '.cpp'
open(source_name, 'w').write(hello_cpp_template.format(project_name=project_name))
open('meson.build', 'w').write(hello_cpp_meson_template.format(project_name=project_name,
exe_name=lowercase_token,
source_name=source_name,
version=project_version))
exe_name=lowercase_token,
source_name=source_name,
version=project_version))
def create_lib_cpp_sample(project_name, version):
lowercase_token = re.sub(r'[^a-z0-9]', '_', project_name.lower())

@ -153,7 +153,7 @@ class PackageGenerator:
'SourceFile': self.redist_path,
'DiskId': '1',
'Language': '0',
})
})
ET.SubElement(product, 'Property', {
'Id': 'WIXUI_INSTALLDIR',
@ -185,7 +185,7 @@ class PackageGenerator:
'AllowAdvertise': 'no',
'Display': 'hidden',
'Level': '1',
})
})
ET.SubElement(vcredist_feature, 'MergeRef', {'Id': 'VCRedist'})
ET.ElementTree(self.root).write(self.main_xml, encoding='utf-8', xml_declaration=True)
# ElementTree can not do prettyprinting so do it manually

@ -1355,9 +1355,9 @@ class AllPlatformTests(BasePlatformTests):
subprocess.check_call(['git', 'config',
'user.email', 'teh_coderz@example.com'], cwd=project_dir)
subprocess.check_call(['git', 'add', 'meson.build', 'distexe.c'], cwd=project_dir,
stdout=subprocess.DEVNULL)
stdout=subprocess.DEVNULL)
subprocess.check_call(['git', 'commit', '-a', '-m', 'I am a project'], cwd=project_dir,
stdout=subprocess.DEVNULL)
stdout=subprocess.DEVNULL)
try:
self.dist_impl(git_init)

Loading…
Cancel
Save