From 920cb9d318bb817323934a92beed057ead27f8bf Mon Sep 17 00:00:00 2001
From: Bert Palm <bert.palm@ufz.de>
Date: Wed, 25 May 2022 13:48:08 +0200
Subject: [PATCH] refactored assertScalar
---
saqc/lib/tools.py | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/saqc/lib/tools.py b/saqc/lib/tools.py
index 7fb6c447e..a70c51e55 100644
--- a/saqc/lib/tools.py
+++ b/saqc/lib/tools.py
@@ -31,10 +31,15 @@ T = TypeVar("T", str, float, int)
def assertScalar(name, value, optional=False):
- if (not np.isscalar(value)) and (value is not None) and (optional is True):
- raise ValueError(f"'{name}' needs to be a scalar or 'None'")
- elif (not np.isscalar(value)) and optional is False:
- raise ValueError(f"'{name}' needs to be a scalar")
+ if optional and value is None:
+ return
+ if np.isscalar(value):
+ return
+
+ msg = f"'{name}' needs to be a scalar"
+ if optional:
+ msg += " or 'None'"
+ raise ValueError(msg)
def toSequence(value: T | Sequence[T]) -> List[T]:
--
GitLab