clean script_tools and timestamp for old py2isms

Author: wdpypere

lib/vsc/utils/script_tools.py

@@ -125,7 +125,7 @@ def __init__(self, options, run_prologue=True, excepthook=None, **kwargs):
         """
 
         options_ = _merge_options(options)
-        super(ExtendedSimpleOption, self).__init__(options_, **kwargs)
+        super().__init__(options_, **kwargs)
 
         self.nagios_reporter = None
         self.lockfile = None
@@ -223,11 +223,11 @@ def critical_exception_handler(self, tp, value, traceback):
         """
         self.log.exception("unhandled exception detected: %s - %s", tp, value)
         self.log.debug("traceback %s", traceback)
-        message = "Script failure: %s - %s" % (tp, value)
+        message = f"Script failure: {tp} - {value}"
         self.critical(message)
 
 
-class CLI(object):
+class CLI:
     """
     Base class to implement cli tools that require timestamps, nagios checks, etc.
     """
@@ -271,13 +271,13 @@ def make_options(self, defaults=None):
         # insert default timestamp value file based on name
         if TIMESTAMP_FILE_OPTION in options:
             tsopt = list(options[TIMESTAMP_FILE_OPTION])
-            tsopt[-1] = os.path.join(self.CACHE_DIR, "%s.timestamp" % self.name)
+            tsopt[-1] = os.path.join(self.CACHE_DIR, f"{self.name}.timestamp")
             options[TIMESTAMP_FILE_OPTION] = tuple(tsopt)
 
         options.update(self.CLI_OPTIONS)
 
         if TIMESTAMP_FILE_OPTION not in options and self.TIMESTAMP_MANDATORY:
-            raise Exception("no mandatory %s option defined" % (TIMESTAMP_FILE_OPTION,))
+            raise ValueError(f"no mandatory {TIMESTAMP_FILE_OPTION} option defined")
 
         return ExtendedSimpleOption(options)
 
@@ -332,7 +332,7 @@ def do(self, dry_run):  #pylint: disable=unused-argument
             self.thresholds can be used to pass the thresholds during epilogue
         """
         logging.error("`do` method not implemented")
-        raise Exception("Not implemented")
+        raise NotImplementedError("Not implemented")
         return "Not implemented"
 
     def make_time(self):
@@ -375,14 +375,13 @@ def post(self, errors, current_time=None):
                 _, timestamp = convert_timestamp(current_time)
                 write_timestamp(self.options.timestamp_file, timestamp)
             except Exception as err:
-                txt = "Writing timestamp %s to %s failed: %s" % (timestamp, self.options.timestamp_file, err)
+                txt = f"Writing timestamp {timestamp} to {self.options.timestamp_file} failed: {err}"
                 self.critical_exception(txt, err)
 
     def final(self):
         """
         Run as finally block in main
         """
-        pass
 
     def main(self):
         """
@@ -406,14 +405,14 @@ def main(self):
 
         self.post(errors)
 
-        self.fulloptions.epilogue("%s complete" % msg, self.thresholds)
+        self.fulloptions.epilogue(f"{msg} complete", self.thresholds)
 
 
 
 class NrpeCLI(CLI):
 
     def __init__(self, name=None, default_options=None):
-        super(NrpeCLI, self).__init__(name=name, default_options=default_options)
+        super().__init__(name=name, default_options=default_options)
 
     def ok(self, msg):
         """

lib/vsc/utils/timestamp.py

@@ -1,4 +1,3 @@
-# -*- coding: latin-1 -*-
 #
 # Copyright 2009-2023 Ghent University
 #
@@ -61,7 +60,7 @@ def convert_to_datetime(timestamp=None):
         return datetime.datetime.utcnow().replace(tzinfo=utc)
 
     if isinstance(timestamp, int):
-        timestamp = "%010d" % timestamp
+        timestamp = f"{int(timestamp):010}"
     if isinstance(timestamp, datetime.datetime):
         if timestamp.tzinfo is None:
             timestamp = timestamp.replace(tzinfo=utc)
@@ -77,7 +76,7 @@ def convert_to_datetime(timestamp=None):
             elif len(timestamp) == 8:
                 date_format = "%Y%m%d"
             else:
-                raise Exception("invalid format provided %s" % timestamp)
+                raise ValueError(f"invalid format provided {timestamp}")
             timestamp = datetime.datetime.strptime(timestamp, date_format)
 
     return timestamp.replace(tzinfo=utc)