From 1fd0647d742b3fd3c236af591753805cc57e010b Mon Sep 17 00:00:00 2001 From: dmc Date: Tue, 25 Jun 2024 12:48:26 +0200 Subject: [PATCH] try to avoid 'None' as target use '-' instead --- devices.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/devices.py b/devices.py index 501f29b..dbb4699 100644 --- a/devices.py +++ b/devices.py @@ -237,7 +237,7 @@ class FrappyConfig(Device): if cfg == '': changes.pop(service) cfg = None - if target_cfgs.get(service): + if target_cfgs.get(service, '-') not in ('', '-'): need_change = 1 if cfg and not isinstance(cfg, Keep): need_change = cfg @@ -256,7 +256,7 @@ class FrappyConfig(Device): secnode = session.devices.get(secnodename) if secnode: cfgs[secnode.service] = secnode.get_info() - targets[secnode.service] = None if secnode.target == 'None' else secnode.target + targets[secnode.service] = secnode.target self._current_cfgs = cfgs self._target_cfgs = targets return cfgs, targets @@ -463,7 +463,7 @@ class FrappyConfig(Device): cfg = cache.get(secnode, 'previous_config', '') if cfg: cfgs[serv] = cfg - self._initial_info = {s: (cfgs.get(s), running.get(s)) for s in fm.services} + self._initial_info = {s: (cfgs.get(s, '-'), running.get(s)) for s in fm.services} fm.get_server_state(config.instrument, cfgs) return self._initial_info[service] @@ -676,7 +676,7 @@ class FrappyNode(SecNodeDevice, Moveable): __log_recording = () def doStart(self, value): - if value == 'None': + if value in ('-', 'None'): value = None self.restart(value) @@ -834,7 +834,7 @@ class FrappyNode(SecNodeDevice, Moveable): def get_info(self): result = self.doRead() or '' code, text = self.status() - if not result and self.target: + if not result and self.target not in ('', '-'): return '' if code == status.OK or result == '': return result