diff --git a/pytools/__init__.py b/pytools/__init__.py index b94faefb1e9f0a40184ccca5409958f476486e96..25740e25e03a52dde4a784833e4aaebff8de9311 100644 --- a/pytools/__init__.py +++ b/pytools/__init__.py @@ -1054,11 +1054,11 @@ def monkeypatch_class(_name, bases, namespace): # {{{ generic utilities def add_tuples(t1, t2): - return tuple([t1v + t2v for t1v, t2v in zip(t1, t2)]) + return tuple(t1v + t2v for t1v, t2v in zip(t1, t2)) def negate_tuple(t1): - return tuple([-t1v for t1v in t1]) + return tuple(-t1v for t1v in t1) def shift(vec, dist): @@ -1609,7 +1609,7 @@ class Table: f"tried to add a row with {len(row)} columns to " f"a table with {self.ncolumns} columns") - self.rows.append(tuple([str(i) for i in row])) + self.rows.append(tuple(str(i) for i in row)) def _get_alignments(self) -> Tuple[str, ...]: # NOTE: If not all alignments were specified, extend alignments with the @@ -1619,9 +1619,9 @@ class Table: ) def _get_column_widths(self, rows) -> Tuple[int, ...]: - return tuple([ + return tuple( max(len(row[i]) for row in rows) for i in range(self.ncolumns) - ]) + ) def __str__(self) -> str: """ @@ -1678,7 +1678,7 @@ class Table: # Pipe symbols ('|') must be replaced return cell.replace("|", "\\|") - rows = [tuple([escape(cell) for cell in row]) for row in self.rows] + rows = [tuple(escape(cell) for cell in row) for row in self.rows] alignments = self._get_alignments() col_widths = self._get_column_widths(rows) @@ -1788,9 +1788,9 @@ def merge_tables(*tables: Table, if i == 0 or skip_columns is None: return row else: - return tuple([ + return tuple( entry for i, entry in enumerate(row) if i not in skip_columns - ]) + ) alignments = sum(( remove_columns(i, tbl._get_alignments()) diff --git a/pytools/convergence.py b/pytools/convergence.py index 4ad5d9219bae5822f4ff931977c13f513de85d6f..ad7b74c78633989db8d7e656c4ae489f27d693ed 100644 --- a/pytools/convergence.py +++ b/pytools/convergence.py @@ -176,7 +176,7 @@ def stringify_eocs(*eocs: EOCRecorder, f"{len(eocs)} EOCRecorder instances") if names is None: - names = tuple([f"{error_label} {i}" for i in range(len(eocs))]) + names = tuple(f"{error_label} {i}" for i in range(len(eocs))) from pytools import merge_tables tbl = merge_tables(*[eoc._to_table(