pythongh-102033: Fix syntax error in Tools/c-analyzer (pythonGH-102066)

The easiest way to format strings with `{}` meaningful chars is via `%`.

Author: sobolevn

Tools/c-analyzer/c_analyzer/__main__.py

@@ -18,10 +18,8 @@
     configure_logger,
     get_prog,
     filter_filenames,
-    iter_marks,
 )
 from c_parser.info import KIND
-from c_parser.match import is_type_decl
 from .match import filter_forward
 from . import (
     analyze as _analyze,

Tools/c-analyzer/c_analyzer/info.py

@@ -1,4 +1,3 @@
-from collections import namedtuple
 import os.path
 
 from c_common import fsutil
@@ -13,9 +12,6 @@
 from c_parser.match import (
     is_type_decl,
 )
-from .match import (
-    is_process_global,
-)
 
 
 IGNORED = _misc.Labeled('IGNORED')

Tools/c-analyzer/c_common/info.py

@@ -1,7 +1,3 @@
-
-_NOT_SET = object()
-
-
 def peek_and_iter(items):
     if not items:
         return None, None

Tools/c-analyzer/c_common/iterutil.py

@@ -1,10 +1,7 @@
 import logging
-import os.path
 import sys
 
-from c_common import fsutil
 from c_common.scriptutil import (
-    CLIArgSpec as Arg,
     add_verbosity_cli,
     add_traceback_cli,
     add_kind_filtering_cli,
@@ -15,7 +12,6 @@
     get_prog,
     main_for_filenames,
 )
-from .preprocessor import get_preprocessor
 from .preprocessor.__main__ import (
     add_common_cli as add_preprocessor_cli,
 )

Tools/c-analyzer/c_common/show.py

@@ -1,14 +1,13 @@
 from collections import namedtuple
 import enum
-import os.path
 import re
 
 from c_common import fsutil
 from c_common.clsutil import classonly
 import c_common.misc as _misc
 import c_common.strutil as _strutil
 import c_common.tables as _tables
-from .parser._regexes import SIMPLE_TYPE, _STORAGE
+from .parser._regexes import _STORAGE
 
 
 FIXED_TYPE = _misc.Labeled('FIXED_TYPE')

Tools/c-analyzer/c_parser/__main__.py

@@ -9,7 +9,6 @@
     set_capture_groups,
 )
 from ._compound_decl_body import DECL_BODY_PARSERS
-#from ._func_body import parse_function_body
 from ._func_body import parse_function_statics as parse_function_body
 
 

Tools/c-analyzer/c_parser/_state_machine.py

@@ -2,7 +2,6 @@
 import sys
 import textwrap
 
-from c_common.fsutil import expand_filenames, iter_files_by_suffix
 from c_common.scriptutil import (
     VERBOSITY,
     add_verbosity_cli,
@@ -11,7 +10,6 @@
     add_kind_filtering_cli,
     add_files_cli,
     add_progress_cli,
-    main_for_filenames,
     process_args_by_key,
     configure_logger,
     get_prog,

Tools/c-analyzer/c_parser/info.py

@@ -4,16 +4,12 @@
 from c_common.clsutil import classonly
 from c_parser.info import (
     KIND,
-    DeclID,
     Declaration,
     TypeDeclaration,
-    TypeDef,
-    Struct,
     Member,
     FIXED_TYPE,
 )
 from c_parser.match import (
-    is_type_decl,
     is_pots,
     is_funcptr,
 )

Tools/c-analyzer/c_parser/parser/_alt.py

@@ -7,7 +7,7 @@
 
 from c_common.tables import build_table, resolve_columns
 from c_parser.parser._regexes import _ind
-from ._files import iter_header_files, resolve_filename
+from ._files import iter_header_files
 from . import REPO_ROOT
 
 
@@ -610,8 +610,7 @@ def _render_item_full(item, groupby, verbose):
     yield item.name
     yield f'  {"filename:":10} {item.relfile}'
     for extra in ('kind', 'level'):
-        #if groupby != extra:
-            yield f'  {extra+":":10} {getattr(item, extra)}'
+        yield f'  {extra+":":10} {getattr(item, extra)}'
     if verbose:
         print('  ---------------------------------------')
         for lno, line in enumerate(item.text, item.lno):
@@ -636,7 +635,6 @@ def render_summary(items, *,
 
     subtotals = summary['totals']['subs']
     bygroup = summary['totals']['bygroup']
-    lastempty = False
     for outer, subtotal in subtotals.items():
         if bygroup:
             subtotal = f'({subtotal})'
@@ -646,10 +644,6 @@ def render_summary(items, *,
         if outer in bygroup:
             for inner, count in bygroup[outer].items():
                 yield f'   {inner + ":":9} {count}'
-            lastempty = False
-        else:
-            lastempty = True
-
     total = f'*{summary["totals"]["all"]}*'
     label = '*total*:'
     if bygroup: