From ade79e1a398d4c144897188f7a00495dbded886d Mon Sep 17 00:00:00 2001 From: "Adam J. Jackson" Date: Thu, 19 Sep 2024 11:14:05 +0100 Subject: [PATCH] Apply suggestions from code review Make things a little cleaner and more idiomatic Co-authored-by: Jacob Wilkins <46597752+oerc0122@users.noreply.github.com> --- euphonic/spectra.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/euphonic/spectra.py b/euphonic/spectra.py index 869d3917..d24a3b88 100644 --- a/euphonic/spectra.py +++ b/euphonic/spectra.py @@ -831,7 +831,7 @@ def _validate_item(self, item: Integral | slice | Sequence[Integral] | np.ndarra raise IndexError(f'index "{item.stop}" out of range') return - if not all([isinstance(i, Integral) for i in item]): + if not all(isinstance(i, Integral) for i in item): raise TypeError( f'Index "{item}" should be an integer, slice ' f'or sequence of ints') @@ -879,9 +879,9 @@ def __add__(self, other: Self) -> Self: def iter_metadata(self) -> Generator[OneLineData, None, None]: """Iterate over metadata dicts of individual spectra from collection""" - common_metadata = dict( - (key, self.metadata[key]) - for key in set(self.metadata.keys()) - {"line_data",}) + common_metadata = { + key: self.metadata[key] + for key in set(self.metadata.keys()) - {"line_data",}} line_data = self.metadata.get("line_data") if line_data is None: @@ -1039,7 +1039,7 @@ def to_dict(self) -> Dict[str, Any]: @classmethod def from_dict(cls: Self, d: dict) -> Self: """Initialise a Spectrum Collection object from dict""" - data_keys = list(f"{dim}_data" for dim in cls._bin_axes) + data_keys = [f"{dim}_data" for dim in cls._bin_axes] data_keys.append(cls._spectrum_data_name()) d = _process_dict(d, @@ -1852,7 +1852,7 @@ def __init__( f'z_data contains {len(z_data)} spectra, but ' f'metadata["line_data"] contains ' f'{len(metadata["line_data"])} entries') - self.metadata = {} if metadata is None else metadata + self.metadata = metadata if metadata is not None else {} def _split_by_indices(self, indices: Sequence[int] | np.ndarray ) -> List[Self]: