From 75938e0d4f37a4dd90c181a6a1d1b19142def00d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20Zar=C4=99bski?= Date: Wed, 12 Jun 2024 09:34:08 +0100 Subject: [PATCH] Fix wrong types on Run error returns --- simvue/run.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/simvue/run.py b/simvue/run.py index 40495056..23deef9f 100644 --- a/simvue/run.py +++ b/simvue/run.py @@ -1182,13 +1182,11 @@ def save_object( # Register file try: - file_save = self._simvue.save_file(data) + return self._simvue is not None and self._simvue.save_file(data) is not None except RuntimeError as e: self._error(f"{e.args[0]}") return False - return self._simvue is not None and file_save is not None - @skip_if_failed("_aborted", "_suppress_errors", False) @check_run_initialised @pydantic.validate_call @@ -1409,14 +1407,12 @@ def set_status( self._status = status try: - updated = self._simvue.update(data) + if self._simvue and self._simvue.update(data): + return True except RuntimeError as e: self._error(f"{e.args[0]}") return False - if self._simvue and updated: - return True - return False @skip_if_failed("_aborted", "_suppress_errors", False) @@ -1733,7 +1729,7 @@ def create_alert( alerts = self._simvue.list_alerts() except RuntimeError as e: self._error(f"{e.args[0]}") - return alerts + return None if alerts: for existing_alert in alerts: @@ -1748,7 +1744,7 @@ def create_alert( response = self._simvue.add_alert(alert) except RuntimeError as e: self._error(f"{e.args[0]}") - return False + return None if response: if "id" in response: alert_id = response["id"] @@ -1764,7 +1760,7 @@ def create_alert( self._simvue.update(data) except RuntimeError as e: self._error(f"{e.args[0]}") - return False + return None return alert_id