Use similar f-strings for more cases

diff --git a/kconfig_hardened_check/__init__.py b/kconfig_hardened_check/__init__.py
index f89ac983a1694012b8faefc586e294e5fe7fbd13..7ba62e0fc40e68772dc811a096e8033dfd180fa2 100644 (file)
--- a/kconfig_hardened_check/__init__.py
+++ b/kconfig_hardened_check/__init__.py
@@ -49,7 +49,7 @@ def detect_kernel_version(fname):
                 ver_str = parts[2]
                 ver_numbers = ver_str.split('.')
                 if len(ver_numbers) < 3 or not ver_numbers[0].isdigit() or not ver_numbers[1].isdigit():
                 ver_str = parts[2]
                 ver_numbers = ver_str.split('.')
                 if len(ver_numbers) < 3 or not ver_numbers[0].isdigit() or not ver_numbers[1].isdigit():

-                    msg = 'failed to parse the version "' + ver_str + '"'
+                    msg = f'failed to parse the version "{ver_str}"'

                     return None, msg
                 return (int(ver_numbers[0]), int(ver_numbers[1])), None
         return None, 'no kernel version detected'
                     return None, msg
                 return (int(ver_numbers[0]), int(ver_numbers[1])), None
         return None, 'no kernel version detected'


@@ -111,7 +111,7 @@ def print_checklist(mode, checklist, with_results):
     if with_results:
         sep_line_len += 30
     print('=' * sep_line_len)
     if with_results:
         sep_line_len += 30
     print('=' * sep_line_len)

-    print(f"{'option name':^40}|{'type':^7}|{'desired val':^12}|{'decision':^10}|{'reason':^18}", end='')
+    print(f'{"option name":^40}|{"type":^7}|{"desired val":^12}|{"decision":^10}|{"reason":^18}', end='')

     if with_results:
         print('| check result', end='')
     print()
     if with_results:
         print('| check result', end='')
     print()

diff --git a/kconfig_hardened_check/engine.py b/kconfig_hardened_check/engine.py
index 621fdc707c2838d475f1701d7d54bf89db4aeea4..0d27b775660d8f73a06f2537573dfcf4f29c4a30 100644 (file)
--- a/kconfig_hardened_check/engine.py
+++ b/kconfig_hardened_check/engine.py
@@ -67,7 +67,7 @@ class OptCheck:
             elif self.state is None:
                 self.result = 'FAIL: is off, not found'
             else:
             elif self.state is None:
                 self.result = 'FAIL: is off, not found'
             else:

-                self.result = 'OK: is not off, "' + self.state + '"'
+                self.result = f'OK: is not off, "{self.state}"'

             return
 
         # handle the option value check
             return
 
         # handle the option value check


@@ -79,7 +79,7 @@ class OptCheck:
             else:
                 self.result = 'FAIL: is not found'
         else:
             else:
                 self.result = 'FAIL: is not found'
         else:

-            self.result = 'FAIL: "' + self.state + '"'
+            self.result = f'FAIL: "{self.state}"'

 
     def table_print(self, _mode, with_results):
         print(f'{self.name:<40}|{self.type:^7}|{self.expected:^12}|{self.decision:^10}|{self.reason:^18}', end='')
 
     def table_print(self, _mode, with_results):
         print(f'{self.name:<40}|{self.type:^7}|{self.expected:^12}|{self.decision:^10}|{self.reason:^18}', end='')


@@ -123,18 +123,18 @@ class VersionCheck:
 
     def check(self):
         if self.ver[0] > self.ver_expected[0]:
 
     def check(self):
         if self.ver[0] > self.ver_expected[0]:

-            self.result = 'OK: version >= ' + str(self.ver_expected[0]) + '.' + str(self.ver_expected[1])
+            self.result = f'OK: version >= {self.ver_expected[0]}.{self.ver_expected[1]}'

             return
         if self.ver[0] < self.ver_expected[0]:
             return
         if self.ver[0] < self.ver_expected[0]:

-            self.result = 'FAIL: version < ' + str(self.ver_expected[0]) + '.' + str(self.ver_expected[1])
+            self.result = f'FAIL: version < {self.ver_expected[0]}.{self.ver_expected[1]}'

             return
         if self.ver[1] >= self.ver_expected[1]:
             return
         if self.ver[1] >= self.ver_expected[1]:

-            self.result = 'OK: version >= ' + str(self.ver_expected[0]) + '.' + str(self.ver_expected[1])
+            self.result = f'OK: version >= {self.ver_expected[0]}.{self.ver_expected[1]}'

             return
             return

-        self.result = 'FAIL: version < ' + str(self.ver_expected[0]) + '.' + str(self.ver_expected[1])
+        self.result = f'FAIL: version < {self.ver_expected[0]}.{self.ver_expected[1]}'

 
     def table_print(self, _mode, with_results):
 
     def table_print(self, _mode, with_results):

-        ver_req = 'kernel version >= ' + str(self.ver_expected[0]) + '.' + str(self.ver_expected[1])
+        ver_req = f'kernel version >= {self.ver_expected[0]}.{self.ver_expected[1]}'

         print(f'{ver_req:<91}', end='')
         if with_results:
             print(f'| {self.result}', end='')
         print(f'{ver_req:<91}', end='')
         if with_results:
             print(f'| {self.result}', end='')


@@ -165,7 +165,7 @@ class ComplexOptCheck:
 
     def table_print(self, mode, with_results):
         if mode == 'verbose':
 
     def table_print(self, mode, with_results):
         if mode == 'verbose':

-            print(f"    {'<<< ' + self.__class__.__name__ + ' >>>':87}", end='')
+            print(f'    {"<<< " + self.__class__.__name__ + " >>>":87}', end='')

             if with_results:
                 print(f'| {self.result}', end='')
             for o in self.opts:
             if with_results:
                 print(f'| {self.result}', end='')
             for o in self.opts: