Merge pull request #539 from powerapi-ng/refactor/printf-string-formatting

refactor: Remove usage of printf string formatting

Author: gfieni

.ruff.toml

@@ -16,7 +16,6 @@ select = [
 ignore = [
     "E501",   # line too long
 
-    "UP031",  # printf-string-formatting
     "UP035",  # deprecated-import
     "B006",   # mutable-argument-default
     "B008",   # function-call-in-default-argument

src/powerapi/report/control_report.py

@@ -55,7 +55,7 @@ def __init__(self, timestamp: datetime, sensor: str, target: str, action: str, p
         self.parameters = parameters
 
     def __repr__(self) -> str:
-        return 'ControlReport(%s, %s, %s, %s, %s, %s)' % (self.timestamp, self.sensor, self.target, self.action, self.parameters, str(self.metadata))
+        return f'ControlReport({self.timestamp}, {self.sensor}, {self.target}, {self.action}, {self.parameters}, {self.metadata})'
 
     def __eq__(self, other: Any) -> bool:
         if not isinstance(other, ControlReport):

src/powerapi/report/hwpc_report.py

@@ -84,8 +84,7 @@ def __init__(self, timestamp: datetime, sensor: str, target: str, groups: dict[s
         self.groups = groups
 
     def __repr__(self) -> str:
-        return 'HWCPReport(%s, %s, %s, %s)' % (
-            self.timestamp, self.sensor, self.target, sorted(self.groups.keys()))
+        return f'HWPCReport({self.timestamp}, {self.sensor}, {self.target}, {sorted(self.groups.keys())}, {self.metadata})'
 
     def __eq__(self, other) -> bool:
         if not isinstance(other, HWPCReport):

src/powerapi/report/power_report.py

@@ -56,8 +56,7 @@ def __init__(self, timestamp: datetime, sensor: str, target: str, power: float,
         self.power = power
 
     def __repr__(self) -> str:
-        return 'PowerReport(%s, %s, %s, %f, %s)' % (
-            self.timestamp, self.sensor, self.target, self.power, str(self.metadata))
+        return f'PowerReport({self.timestamp}, {self.sensor}, {self.target}, {self.power}, {self.metadata})'
 
     def __eq__(self, other) -> bool:
         if not isinstance(other, PowerReport):

src/powerapi/report/procfs_report.py

@@ -69,7 +69,7 @@ def __init__(self, timestamp: datetime, sensor: str, target: str, usage: dict, g
         self.global_cpu_usage = global_cpu_usage
 
     def __repr__(self) -> str:
-        return 'ProcfsReport(%s, %s, %s, %s, %s)' % (self.timestamp, self.sensor, self.target, sorted(self.usage.keys()), str(self.metadata))
+        return f'ProcfsReport({self.timestamp}, {self.sensor}, {self.target}, {sorted(self.usage.keys())}, {self.metadata})'
 
     def __eq__(self, other) -> bool:
         if not isinstance(other, ProcfsReport):

src/powerapi/report/report.py

@@ -88,10 +88,10 @@ def __init__(self, timestamp: datetime, sensor: str, target: str, metadata: dict
         self.dispatcher_report_id = None
 
     def __str__(self):
-        return '%s(%s, %s, %s)' % (self.__class__.__name__, self.timestamp, self.sensor, self.target)
+        return f'{self.__class__.__name__}({self.timestamp}, {self.sensor}, {self.target}, {self.metadata})'
 
     def __repr__(self):
-        return '%s(%s, %s, %s)' % (self.__class__.__name__, self.timestamp, self.sensor, self.target)
+        return f'{self.__class__.__name__}({self.timestamp}, {self.sensor}, {self.target}, {self.metadata})'
 
     def __eq__(self, other):
         return (isinstance(other, type(self)) and