From 8b0c3ae3db8aa9a7f91f4339e751393c8a7e6620 Mon Sep 17 00:00:00 2001 From: Nic Boet Date: Fri, 15 Nov 2024 21:58:08 -0600 Subject: [PATCH] revert this catch it wsn't right Signed-off-by: Nic Boet --- pyproject.toml | 2 +- zoneminder/monitor.py | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index a8041e8..7990a5e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "zm-py" -version = "0.5.5.dev3" +version = "0.5.5.dev4" description = "A loose python wrapper around the ZoneMinder REST API." authors = ["Rohan Kapoor "] maintainers = ["Nic Boet "] diff --git a/zoneminder/monitor.py b/zoneminder/monitor.py index 4b14c63..9bd52f8 100755 --- a/zoneminder/monitor.py +++ b/zoneminder/monitor.py @@ -122,17 +122,14 @@ def name(self) -> str: def update_monitor(self): """Update the monitor and monitor status from the ZM server.""" result = self._client.get_state(self._monitor_url) - try: - self._raw_result = result["monitor"] - except KeyError: - return False + self._raw_result = result["monitor"] @property def function(self) -> MonitorState: """Get the MonitorState of this Monitor.""" - if self.update_monitor(): - return MonitorState(self._raw_result["Monitor"]["Function"]) - return "Error-MonitorState" + self.update_monitor() + + return MonitorState(self._raw_result["Monitor"]["Function"]) @function.setter def function(self, new_function):