aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Turney <jon.turney@dronecode.org.uk>2018-03-03 21:12:39 +0000
committerJon Turney <jon.turney@dronecode.org.uk>2018-03-03 21:35:53 +0000
commit2f6ed470771858d96d435131e2624fb144464973 (patch)
treeb00c7bd88bebb14a3b1525324607e4d4725eca3f
parentb8b23f4c50f0d702bc463dffd12c858a96a28961 (diff)
downloadmeson-2f6ed470771858d96d435131e2624fb144464973.zip
meson-2f6ed470771858d96d435131e2624fb144464973.tar.gz
meson-2f6ed470771858d96d435131e2624fb144464973.tar.bz2
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
-rw-r--r--mesonbuild/compilers/cpp.py2
-rw-r--r--mesonbuild/minit.py6
-rwxr-xr-xmsi/createmsi.py4
-rwxr-xr-xrun_unittests.py4
4 files changed, 8 insertions, 8 deletions
diff --git a/mesonbuild/compilers/cpp.py b/mesonbuild/compilers/cpp.py
index c10f38e..1fa6f15 100644
--- a/mesonbuild/compilers/cpp.py
+++ b/mesonbuild/compilers/cpp.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):
diff --git a/mesonbuild/minit.py b/mesonbuild/minit.py
index bc2818c..69dd516 100644
--- a/mesonbuild/minit.py
+++ b/mesonbuild/minit.py
@@ -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())
diff --git a/msi/createmsi.py b/msi/createmsi.py
index ec0340d..c709745 100755
--- a/msi/createmsi.py
+++ b/msi/createmsi.py
@@ -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
diff --git a/run_unittests.py b/run_unittests.py
index 09f537d..4eb5d4c 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -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)