diff --git a/src/toargridding/defaultLogging.py b/src/toargridding/defaultLogging.py index 72642ac9c33788bec715e3f6212e7735687dedd9..4f9a448494d4ab1dff4325ae47bf0870cf282b09 100644 --- a/src/toargridding/defaultLogging.py +++ b/src/toargridding/defaultLogging.py @@ -46,7 +46,8 @@ class toargridding_defaultLogging: Throws an exception if the name of the handler is already known. """ if name in self.registeredHandlers: - raise ValueError(f"There is already a registered handler with the name {name}.") + msg = f"There is already a registered handler with the name {name}." + raise ValueError(msg) if formatter is not None: handler.setFormatter(formatter) self.logger.addHandler(handler) @@ -128,7 +129,8 @@ class toargridding_defaultLogging: """ sn = Path(scriptName) if not sn.is_file: - raise ValueError(f"Expecting name to a script. {sn} is not a file.") + msg = f"Expecting name to a script. {sn} is not a file." + raise ValueError(msg) path = sn.parent / "log" path.mkdir(exist_ok=True) fn = path / f"{sn.stem}.log" diff --git a/src/toargridding/metadata.py b/src/toargridding/metadata.py index d3ebe88092c5346ef24c1b6fc199b98970dc127e..6af0394335c0b941e20364ef3ee8b3439c2b4c88 100644 --- a/src/toargridding/metadata.py +++ b/src/toargridding/metadata.py @@ -57,9 +57,8 @@ class TimeSample: @sampling.setter def sampling(self, sampling: str): if sampling not in ALLOWED_SAMPLING_VALUES: - raise ValueError( - f"sampling: {sampling} is not in the list of supported samplings for toargridding: {ALLOWED_SAMPLING_VALUES}" - ) + msg = f"sampling: {sampling} is not in the list of supported samplings for toargridding: {ALLOWED_SAMPLING_VALUES}" + raise ValueError(msg) self._sampling = sampling def as_datetime_index(self) -> pd.DatetimeIndex: @@ -145,7 +144,8 @@ class Metadata: @statistic.setter def statistic(self, stat: str): if stat not in STATISTICS_LIST: - raise ValueError(f"invalid statistic: {stat}") + msg = f"invalid statistic: {stat}" + raise ValueError(msg) self._statistic = stat def get_id(self) -> str: @@ -225,9 +225,8 @@ def get_global_attributes(metadata: Metadata) -> dict: if key not in dynamic_cf_attributes: dynamic_cf_attributes[key] = value else: - raise ValueError( - f'{key} is already has the value {dynamic_cf_attributes[key]}. Prohibited overriding with "{value}"!' - ) + msg = f'{key} is already has the value {dynamic_cf_attributes[key]}. Prohibited overriding with "{value}"!' + raise ValueError(msg) cf_attributes = dynamic_cf_attributes | global_cf_attributes return cf_attributes diff --git a/src/toargridding/static_metadata.py b/src/toargridding/static_metadata.py index 11f713a02ab538bc570d7cabcef2be0e8ec3bee4..9ab2717498f2337f5e21ba4c58732dd0285eb417 100644 --- a/src/toargridding/static_metadata.py +++ b/src/toargridding/static_metadata.py @@ -70,7 +70,8 @@ class TOARVariable: try: return cls.get_from_name(name=name) except ValueError: - raise ValueError(f"TOAR Database contains no variable with cf_standardname or name '{name}'") + msg = f"TOAR Database contains no variable with cf_standardname or name '{name}'" + raise ValueError(msg) @classmethod def get_from_cf_standardname(cls, standard_name: str) -> "TOARVariable": @@ -89,7 +90,8 @@ class TOARVariable: for var in cls.vars: if var.standard_name == standard_name: return var - raise ValueError(f"TOAR Database contains no variable with cf_standardname {standard_name}") + msg = f"TOAR Database contains no variable with cf_standardname {standard_name}" + raise ValueError(msg) @classmethod def get_from_name(cls, name: str) -> "TOARVariable": @@ -108,7 +110,8 @@ class TOARVariable: for var in cls.vars: if var.name == name: return var - raise ValueError(f"TOAR Database contains no variable {name}") + msg = f"TOAR Database contains no variable {name}" + raise ValueError(msg) @property def toar_id(self):