From cd5dba5358e8a4f7a9d4a1ebf315db1f65c87180 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Sat, 3 Mar 2018 15:56:33 +0000 Subject: Fix flake8 'imported but unused' reports $ flake8 | grep F401 ./meson.py:17:1: F401 'mesonbuild.mesonlib' imported but unused ./meson.py:18:1: F401 'locale' imported but unused ./run_unittests.py:24:1: F401 'sys' imported but unused ./mesonbuild/minit.py:2:1: F401 'pyclbr.Function' imported but unused ./mesonbuild/minit.py:18:1: F401 'os' imported but unused ./mesonbuild/backend/vs2010backend.py:15:1: F401 'sys' imported but unused ./mesonbuild/backend/xcodebackend.py:19:1: F401 'sys' imported but unused ./mesonbuild/dependencies/ui.py:20:1: F401 'shutil' imported but unused ./mesonbuild/modules/python3.py:15:1: F401 'sys' imported but unused ./mesonbuild/modules/unstable_icestorm.py:15:1: F401 '..compilers' imported but unused ./mesonbuild/modules/unstable_icestorm.py:15:1: F401 '..mlog' imported but unused ./test cases/common/98 gen extra/srcgen3.py:3:1: F401 'os' imported but unused --- mesonbuild/minit.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'mesonbuild/minit.py') diff --git a/mesonbuild/minit.py b/mesonbuild/minit.py index 98817cb..62e2639 100644 --- a/mesonbuild/minit.py +++ b/mesonbuild/minit.py @@ -1,5 +1,4 @@ # Copyright 2017 The Meson development team -from pyclbr import Function # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,7 +14,7 @@ from pyclbr import Function """Code that creates simple startup projects.""" -import os, sys, argparse, re +import sys, argparse, re from glob import glob lib_h_template = '''#pragma once -- cgit v1.1 From b8b23f4c50f0d702bc463dffd12c858a96a28961 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Sat, 3 Mar 2018 16:03:41 +0000 Subject: Fix various flake8 whitespace reports $ flake8 | grep -E '(E203|E221|E226|E303|W291|W293)' ./run_unittests.py:1503:5: E303 too many blank lines (2) ./mesonbuild/interpreter.py:2342:64: E226 missing whitespace around arithmetic operator ./mesonbuild/minit.py:110:17: E221 multiple spaces before operator ./mesonbuild/minit.py:131:1: W293 blank line contains whitespace ./mesonbuild/minit.py:135:19: E221 multiple spaces before operator ./mesonbuild/minit.py:155:1: W293 blank line contains whitespace ./mesonbuild/minit.py:181:1: W293 blank line contains whitespace ./mesonbuild/minit.py:183:1: W293 blank line contains whitespace ./mesonbuild/minit.py:294:47: W291 trailing whitespace ./mesonbuild/minit.py:331:47: W291 trailing whitespace ./mesonbuild/modules/unstable_icestorm.py:49:1: W293 blank line contains whitespace ./mesonbuild/modules/unstable_icestorm.py:76:31: E203 whitespace before ':' ./mesonbuild/modules/unstable_icestorm.py:82:22: E203 whitespace before ':' --- mesonbuild/minit.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'mesonbuild/minit.py') diff --git a/mesonbuild/minit.py b/mesonbuild/minit.py index 62e2639..bc2818c 100644 --- a/mesonbuild/minit.py +++ b/mesonbuild/minit.py @@ -106,7 +106,7 @@ pkg_mod.generate( ) ''' -hello_c_template = '''#include +hello_c_template = '''#include #define PROJECT_NAME "{project_name}" @@ -127,11 +127,11 @@ hello_c_meson_template = '''project('{project_name}', 'c', exe = executable('{exe_name}', '{source_name}', install : true) - + test('basic', exe) ''' -hello_cpp_template = '''#include +hello_cpp_template = '''#include #define PROJECT_NAME "{project_name}" @@ -151,7 +151,7 @@ hello_cpp_meson_template = '''project('{project_name}', 'cpp', exe = executable('{exe_name}', '{source_name}', install : true) - + test('basic', exe) ''' @@ -177,9 +177,9 @@ class {utoken}_PUBLIC {class_name} {{ public: {class_name}(); int get_number() const; - + private: - + int number; }}; @@ -290,7 +290,7 @@ def create_lib_c_sample(project_name, version): 'function_name': function_name, 'header_file': lib_h_name, 'source_file': lib_c_name, - 'test_source_file': test_c_name, + 'test_source_file': test_c_name, 'test_exe_name': lowercase_token, 'project_name': project_name, 'lib_name': lowercase_token, @@ -327,7 +327,7 @@ def create_lib_cpp_sample(project_name, version): 'namespace': namespace, 'header_file': lib_h_name, 'source_file': lib_c_name, - 'test_source_file': test_c_name, + 'test_source_file': test_c_name, 'test_exe_name': lowercase_token, 'project_name': project_name, 'lib_name': lowercase_token, -- cgit v1.1 From 2f6ed470771858d96d435131e2624fb144464973 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Sat, 3 Mar 2018 21:12:39 +0000 Subject: 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 --- mesonbuild/minit.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mesonbuild/minit.py') 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()) -- cgit v1.1 From 8958529a2596c73bdb3cb599ced5f2c440359b5a Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Sat, 3 Mar 2018 21:20:00 +0000 Subject: Fix flake8 'variable assigned value but unused' reports $ flake8 | grep -E 'F841' ./run_unittests.py:1987:13: F841 local variable 'objc' is assigned to but never used ./run_unittests.py:1988:13: F841 local variable 'objcpp' is assigned to but never used ./mesonbuild/minit.py:272:5: F841 local variable 'uppercase_token' is assigned to but never used ./mesonbuild/minit.py:307:5: F841 local variable 'uppercase_token' is assigned to but never used ./mesonbuild/modules/unstable_icestorm.py:36:9: F841 local variable 'result' is assigned to but never used ./mesonbuild/modules/unstable_icestorm.py:78:9: F841 local variable 'up_target' is assigned to but never used ./mesonbuild/modules/unstable_icestorm.py:81:9: F841 local variable 'time_target' is assigned to but never used ./msi/createmsi.py:226:17: F841 local variable 'file_source' is assigned to but never used --- mesonbuild/minit.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'mesonbuild/minit.py') diff --git a/mesonbuild/minit.py b/mesonbuild/minit.py index 69dd516..4459a05 100644 --- a/mesonbuild/minit.py +++ b/mesonbuild/minit.py @@ -269,7 +269,6 @@ ninja -C builddir def create_exe_c_sample(project_name, project_version): lowercase_token = re.sub(r'[^a-z0-9]', '_', project_name.lower()) - uppercase_token = lowercase_token.upper() source_name = lowercase_token + '.c' open(source_name, 'w').write(hello_c_template.format(project_name=project_name)) open('meson.build', 'w').write(hello_c_meson_template.format(project_name=project_name, @@ -304,7 +303,6 @@ def create_lib_c_sample(project_name, version): def create_exe_cpp_sample(project_name, project_version): lowercase_token = re.sub(r'[^a-z0-9]', '_', project_name.lower()) - uppercase_token = lowercase_token.upper() 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, -- cgit v1.1