Skip to content

Commit d4cc494

Browse files
committed
refactor: Concatenate collections with iterable unpacking
1 parent 42ea88a commit d4cc494

File tree

8 files changed

+10
-10
lines changed

8 files changed

+10
-10
lines changed

src/powerapi/database/prometheus_db.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ def __iter__(self):
113113
def _init_metrics(self):
114114

115115
if not self.metrics_initialized:
116-
self.energy_metric_labels_names = [SENSOR_TAG, TARGET_TAG] + self.tags
116+
self.energy_metric_labels_names = [SENSOR_TAG, TARGET_TAG, *self.tags]
117117
self.energy_metric = Gauge(self.metric_name, self.metric_description, self.energy_metric_labels_names)
118118
self.metrics_initialized = True
119119

src/powerapi/dispatch_rule/power_dispatch_rule.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ def extract_id_from_report(report: PowerReport, depth: PowerDepthLevel) -> tuple
5555
return (report.sensor,)
5656

5757
if depth == PowerDepthLevel.SOCKET:
58-
return extract_id_from_report(report, depth - 1) + (report.metadata['socket'],)
58+
return *extract_id_from_report(report, depth - 1), report.metadata['socket']
5959

60-
return extract_id_from_report(report, depth - 1) + (report.metadata['core'],)
60+
return *extract_id_from_report(report, depth - 1), report.metadata['core']
6161

6262

6363
class PowerDispatchRule(DispatchRule):

src/powerapi/dispatcher/dispatcher_actor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def add_formula(self, formula_id: tuple) -> FormulaActor:
6565
:param formula_id: The formula ID
6666
:return: The new formula actor
6767
"""
68-
formula = self.actor.formula_init_function(name=str((self.actor.name,) + formula_id), pushers=self.pushers)
68+
formula = self.actor.formula_init_function(name=str((self.actor.name, *formula_id)), pushers=self.pushers)
6969
self.supervisor.launch_actor(formula, False)
7070
self.formula_dict[formula_id] = formula
7171
return formula

src/powerapi/report/formula_report.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
from powerapi.report.report import Report, CSV_HEADER_COMMON
3737

38-
CSV_HEADER_FORMULA_REPORT = CSV_HEADER_COMMON + ['metadata']
38+
CSV_HEADER_FORMULA_REPORT = [*CSV_HEADER_COMMON, 'metadata']
3939

4040

4141
class FormulaReport(Report):

src/powerapi/report/hwpc_report.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
SOCKET_KEY = 'socket'
3939
CPU_KEY = 'cpu'
4040

41-
CSV_HEADER_HWPC = CSV_HEADER_COMMON + [SOCKET_KEY, CPU_KEY]
41+
CSV_HEADER_HWPC = [*CSV_HEADER_COMMON, SOCKET_KEY, CPU_KEY]
4242

4343

4444
class HWPCReport(Report):

src/powerapi/report/power_report.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
from powerapi.report.report import Report, CSV_HEADER_COMMON, BadInputData, CsvLines
3636

37-
CSV_HEADER_POWER = CSV_HEADER_COMMON + ['power', 'socket']
37+
CSV_HEADER_POWER = [*CSV_HEADER_COMMON, 'power', 'socket']
3838

3939

4040
class PowerReport(Report):

src/powerapi/report/procfs_report.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
from powerapi.report.report import Report, BadInputData, CSV_HEADER_COMMON, CsvLines
3737

3838

39-
CSV_HEADER_PROCFS = CSV_HEADER_COMMON + ['socket', 'cpu', 'usage', 'global_cpu_usage']
39+
CSV_HEADER_PROCFS = [*CSV_HEADER_COMMON, 'socket', 'cpu', 'usage', 'global_cpu_usage']
4040

4141

4242
class ProcfsReport(Report):

tests/unit/dispatcher/test_dispatcher_actor.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ def __init__(self, primary=False):
133133

134134
def get_formula_id(self, report):
135135
b2_id = [] if report.b2 is None else [(report.a, report.b2)]
136-
return [(report.a, report.b)] + b2_id
136+
return [(report.a, report.b), *b2_id]
137137

138138

139139
class Report2(Report):
@@ -191,7 +191,7 @@ def __init__(self, primary=False):
191191

192192
def get_formula_id(self, report):
193193
c2_ids = [] if report.c2 is None else [(report.a, report.c2)]
194-
return [(report.a, report.c)] + c2_ids
194+
return [(report.a, report.c), *c2_ids]
195195

196196

197197
class Report3(Report):

0 commit comments

Comments
 (0)