From bd43103399c363609ec6d4f5650c64bd58768dba Mon Sep 17 00:00:00 2001 From: Alexander Popov Date: Tue, 16 Jan 2024 20:33:58 +0300 Subject: [PATCH] Fix style (III) Use f-strings. --- kernel_hardening_checker/__init__.py | 6 +++--- kernel_hardening_checker/engine.py | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/kernel_hardening_checker/__init__.py b/kernel_hardening_checker/__init__.py index 8f7d312..cc256f7 100644 --- a/kernel_hardening_checker/__init__.py +++ b/kernel_hardening_checker/__init__.py @@ -74,9 +74,9 @@ def detect_compiler(fname): if gcc_version is None or clang_version is None: return None, 'no CONFIG_GCC_VERSION or CONFIG_CLANG_VERSION' if gcc_version == '0' and clang_version != '0': - return 'CLANG ' + clang_version, 'OK' + return f'CLANG {clang_version}', 'OK' if gcc_version != '0' and clang_version == '0': - return 'GCC ' + gcc_version, 'OK' + return f'GCC {gcc_version}', 'OK' sys.exit(f'[!] ERROR: invalid GCC_VERSION and CLANG_VERSION: {gcc_version} {clang_version}') @@ -232,7 +232,7 @@ def main(): supported_archs = ['X86_64', 'X86_32', 'ARM64', 'ARM'] parser = ArgumentParser(prog='kernel-hardening-checker', description='A tool for checking the security hardening options of the Linux kernel') - parser.add_argument('--version', action='version', version='%(prog)s ' + __version__) + parser.add_argument('--version', action='version', version=f'%(prog)s {__version__}') parser.add_argument('-m', '--mode', choices=report_modes, help='choose the report mode') parser.add_argument('-c', '--config', diff --git a/kernel_hardening_checker/engine.py b/kernel_hardening_checker/engine.py index a810b98..52ae761 100644 --- a/kernel_hardening_checker/engine.py +++ b/kernel_hardening_checker/engine.py @@ -108,7 +108,7 @@ class OptCheck: class KconfigCheck(OptCheck): def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) - self.name = 'CONFIG_' + self.name + self.name = f'CONFIG_{self.name}' @property def type(self): @@ -183,7 +183,8 @@ class ComplexOptCheck: def table_print(self, mode, with_results): if mode == 'verbose': - print(f' {"<<< " + self.__class__.__name__ + " >>>":87}', end='') + class_name = f'<<< {self.__class__.__name__} >>>' + print(f' {class_name:87}', end='') if with_results: print(f'| {colorize_result(self.result)}', end='') for o in self.opts: -- 2.31.1