Commit bd431033 by Alexander Popov

Fix style (III)

Use f-strings.
parent 67b39125
...@@ -74,9 +74,9 @@ def detect_compiler(fname): ...@@ -74,9 +74,9 @@ def detect_compiler(fname):
if gcc_version is None or clang_version is None: if gcc_version is None or clang_version is None:
return None, 'no CONFIG_GCC_VERSION or CONFIG_CLANG_VERSION' return None, 'no CONFIG_GCC_VERSION or CONFIG_CLANG_VERSION'
if gcc_version == '0' and clang_version != '0': 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': 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}') sys.exit(f'[!] ERROR: invalid GCC_VERSION and CLANG_VERSION: {gcc_version} {clang_version}')
...@@ -232,7 +232,7 @@ def main(): ...@@ -232,7 +232,7 @@ def main():
supported_archs = ['X86_64', 'X86_32', 'ARM64', 'ARM'] supported_archs = ['X86_64', 'X86_32', 'ARM64', 'ARM']
parser = ArgumentParser(prog='kernel-hardening-checker', parser = ArgumentParser(prog='kernel-hardening-checker',
description='A tool for checking the security hardening options of the Linux kernel') 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, parser.add_argument('-m', '--mode', choices=report_modes,
help='choose the report mode') help='choose the report mode')
parser.add_argument('-c', '--config', parser.add_argument('-c', '--config',
......
...@@ -108,7 +108,7 @@ class OptCheck: ...@@ -108,7 +108,7 @@ class OptCheck:
class KconfigCheck(OptCheck): class KconfigCheck(OptCheck):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
self.name = 'CONFIG_' + self.name self.name = f'CONFIG_{self.name}'
@property @property
def type(self): def type(self):
...@@ -183,7 +183,8 @@ class ComplexOptCheck: ...@@ -183,7 +183,8 @@ class ComplexOptCheck:
def table_print(self, mode, with_results): def table_print(self, mode, with_results):
if mode == 'verbose': 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: if with_results:
print(f'| {colorize_result(self.result)}', end='') print(f'| {colorize_result(self.result)}', end='')
for o in self.opts: for o in self.opts:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment