From 967840543f1f20754dd1579083e8a8271ab6cb62 Mon Sep 17 00:00:00 2001 From: Eisuke Kawashima Date: Fri, 15 Oct 2021 22:54:46 +0900 Subject: Fix Flake8 Errors (#442) * Fix PEP8 [E101](https://github.com/PyCQA/pycodestyle/blob/2.8.0/docs/intro.rst#error-codes) * Fix PEP8 [E711](https://github.com/PyCQA/pycodestyle/blob/2.8.0/docs/intro.rst#error-codes) * Fix E999 (python2) * Fix PEP8 [F401](https://flake8.pycqa.org/en/4.0.1/user/error-codes.html) --- examples/dump_ast.py | 2 +- examples/explore_ast.py | 2 +- examples/func_calls.py | 2 +- examples/func_defs.py | 2 +- examples/func_defs_add_param.py | 1 - examples/rewrite_ast.py | 1 - pycparser/_ast_gen.py | 1 - pycparser/c_lexer.py | 1 - pycparser/c_parser.py | 6 ++---- tests/test_c_ast.py | 2 -- tests/test_c_generator.py | 1 - tests/test_c_parser.py | 6 ++---- tests/test_general.py | 1 - utils/internal/fake_includes.py | 3 ++- utils/internal/make_fake_typedefs.py | 5 +++-- utils/internal/memprofiling.py | 4 +--- utils/internal/zz-ctoc.py | 2 +- utils/internal/zz_parse.py | 3 +-- 18 files changed, 16 insertions(+), 29 deletions(-) diff --git a/examples/dump_ast.py b/examples/dump_ast.py index 63f5e2d..b7c3273 100644 --- a/examples/dump_ast.py +++ b/examples/dump_ast.py @@ -14,7 +14,7 @@ import sys # your site-packages/ with setup.py sys.path.extend(['.', '..']) -from pycparser import c_parser, c_ast, parse_file +from pycparser import parse_file if __name__ == "__main__": argparser = argparse.ArgumentParser('Dump AST') diff --git a/examples/explore_ast.py b/examples/explore_ast.py index 1f6e0ae..a75dd1f 100644 --- a/examples/explore_ast.py +++ b/examples/explore_ast.py @@ -20,7 +20,7 @@ import sys # sys.path.extend(['.', '..']) -from pycparser import c_parser, c_ast +from pycparser import c_parser # This is some C source to parse. Note that pycparser must begin # at the top level of the C file, i.e. with either declarations diff --git a/examples/func_calls.py b/examples/func_calls.py index 97a7271..ce9cc87 100644 --- a/examples/func_calls.py +++ b/examples/func_calls.py @@ -14,7 +14,7 @@ import sys # your site-packages/ with setup.py sys.path.extend(['.', '..']) -from pycparser import c_parser, c_ast, parse_file +from pycparser import c_ast, parse_file # A visitor with some state information (the funcname it's looking for) diff --git a/examples/func_defs.py b/examples/func_defs.py index 8fe9889..5023ff7 100644 --- a/examples/func_defs.py +++ b/examples/func_defs.py @@ -17,7 +17,7 @@ import sys # your site-packages/ with setup.py sys.path.extend(['.', '..']) -from pycparser import c_parser, c_ast, parse_file +from pycparser import c_ast, parse_file # A simple visitor for FuncDef nodes that prints the names and diff --git a/examples/func_defs_add_param.py b/examples/func_defs_add_param.py index d79fef6..11cb635 100644 --- a/examples/func_defs_add_param.py +++ b/examples/func_defs_add_param.py @@ -8,7 +8,6 @@ # License: BSD #----------------------------------------------------------------- from __future__ import print_function -import sys from pycparser import c_parser, c_ast, c_generator diff --git a/examples/rewrite_ast.py b/examples/rewrite_ast.py index d38e015..164abb5 100644 --- a/examples/rewrite_ast.py +++ b/examples/rewrite_ast.py @@ -7,7 +7,6 @@ # License: BSD #----------------------------------------------------------------- from __future__ import print_function -import sys from pycparser import c_parser diff --git a/pycparser/_ast_gen.py b/pycparser/_ast_gen.py index 027efe7..0f7d330 100644 --- a/pycparser/_ast_gen.py +++ b/pycparser/_ast_gen.py @@ -10,7 +10,6 @@ # Eli Bendersky [https://eli.thegreenplace.net/] # License: BSD #----------------------------------------------------------------- -import pprint from string import Template diff --git a/pycparser/c_lexer.py b/pycparser/c_lexer.py index f861b5c..2990170 100644 --- a/pycparser/c_lexer.py +++ b/pycparser/c_lexer.py @@ -7,7 +7,6 @@ # License: BSD #------------------------------------------------------------------------------ import re -import sys from .ply import lex from .ply.lex import TOKEN diff --git a/pycparser/c_parser.py b/pycparser/c_parser.py index 1be11a4..b1efac1 100644 --- a/pycparser/c_parser.py +++ b/pycparser/c_parser.py @@ -6,13 +6,11 @@ # Eli Bendersky [https://eli.thegreenplace.net/] # License: BSD #------------------------------------------------------------------------------ -import re - from .ply import yacc from . import c_ast from .c_lexer import CLexer -from .plyparser import PLYParser, Coord, ParseError, parameterized, template +from .plyparser import PLYParser, ParseError, parameterized, template from .ast_transforms import fix_switch_cases, fix_atomic_specifiers @@ -1221,7 +1219,7 @@ class CParser(PLYParser): arr = c_ast.ArrayDecl( type=None, dim=c_ast.ID(p[4], self._token_coord(p, 4)), - dim_quals=p[3] if p[3] != None else [], + dim_quals=p[3] if p[3] is not None else [], coord=p[1].coord) p[0] = self._type_modify_decl(decl=p[1], modifier=arr) diff --git a/tests/test_c_ast.py b/tests/test_c_ast.py index 6ea3ceb..eeeb20b 100644 --- a/tests/test_c_ast.py +++ b/tests/test_c_ast.py @@ -1,5 +1,3 @@ -import pprint -import re import sys import unittest import weakref diff --git a/tests/test_c_generator.py b/tests/test_c_generator.py index 4436a43..d166d03 100644 --- a/tests/test_c_generator.py +++ b/tests/test_c_generator.py @@ -1,5 +1,4 @@ import os -import platform import sys import unittest diff --git a/tests/test_c_parser.py b/tests/test_c_parser.py index e83bd7d..33f3f07 100755 --- a/tests/test_c_parser.py +++ b/tests/test_c_parser.py @@ -1,7 +1,5 @@ #!/usr/bin/env python -import pprint -import re import os, sys import io import unittest @@ -10,7 +8,7 @@ sys.path[0:0] = ['.', '..'] from pycparser import c_parser from pycparser.c_ast import * -from pycparser.c_parser import CParser, Coord, ParseError +from pycparser.c_parser import ParseError _c_parser = c_parser.CParser( lex_optimize=False, @@ -729,7 +727,7 @@ class TestCParser_fundamentals(TestCParser_base): def test_parenthesized_compounds(self): e = self.parse(r''' void foo() { - int a; + int a; ({}); ({ 1; }); ({ 1; 2; }); diff --git a/tests/test_general.py b/tests/test_general.py index 3d43cbf..e6b654e 100644 --- a/tests/test_general.py +++ b/tests/test_general.py @@ -1,5 +1,4 @@ import os -import platform import sys import unittest diff --git a/utils/internal/fake_includes.py b/utils/internal/fake_includes.py index 1ce69fa..0e91644 100644 --- a/utils/internal/fake_includes.py +++ b/utils/internal/fake_includes.py @@ -1,10 +1,11 @@ +from __future__ import print_function import os.path for cur_path, dirs, files in os.walk('.'): if cur_path == '.': for f in files: if f.endswith('.h'): - print f + print(f) fo = open(f, 'w') fo.write('#include "_fake_defines.h"\n') fo.write('#include "_fake_typedefs.h"\n') diff --git a/utils/internal/make_fake_typedefs.py b/utils/internal/make_fake_typedefs.py index b82e92f..5ffd04b 100644 --- a/utils/internal/make_fake_typedefs.py +++ b/utils/internal/make_fake_typedefs.py @@ -1,12 +1,13 @@ +from __future__ import print_function import sys sys.path.insert(0, '../..') -from pycparser import c_parser, c_ast, parse_file +from pycparser import c_ast, parse_file class MyVisitor(c_ast.NodeVisitor): def visit_Typedef(self, node): - print 'typedef int %s;' % node.name + print('typedef int %s;' % node.name) diff --git a/utils/internal/memprofiling.py b/utils/internal/memprofiling.py index 5b25120..8584a44 100644 --- a/utils/internal/memprofiling.py +++ b/utils/internal/memprofiling.py @@ -1,8 +1,6 @@ -import sys from pycparser import parse_file from pycparser.c_ast import * -from pycparser.c_parser import CParser, Coord, ParseError -from pycparser.c_lexer import CLexer +from pycparser.c_parser import CParser def expand_decl(decl): diff --git a/utils/internal/zz-ctoc.py b/utils/internal/zz-ctoc.py index 434f9bc..52e037f 100644 --- a/utils/internal/zz-ctoc.py +++ b/utils/internal/zz-ctoc.py @@ -1,5 +1,5 @@ from __future__ import print_function -from pycparser import parse_file, c_parser, c_generator +from pycparser import c_parser, c_generator if __name__ == '__main__': src = r''' diff --git a/utils/internal/zz_parse.py b/utils/internal/zz_parse.py index 9979578..a769ef6 100644 --- a/utils/internal/zz_parse.py +++ b/utils/internal/zz_parse.py @@ -1,7 +1,6 @@ from __future__ import print_function -import sys -from pycparser import c_parser, c_generator, c_ast, parse_file +from pycparser import c_parser, c_generator if __name__ == "__main__": -- cgit v1.2.1