From f9675105baa171405f0db7a5758b5cf1f1c32444 Mon Sep 17 00:00:00 2001 From: ximenes Date: Wed, 15 Apr 2020 16:01:28 -0300 Subject: [PATCH] Bug fix in device.py for dipoles --- siriuspy/siriuspy/VERSION | 2 +- siriuspy/siriuspy/devices/device.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/siriuspy/siriuspy/VERSION b/siriuspy/siriuspy/VERSION index 398935591..0044d6cb9 100644 --- a/siriuspy/siriuspy/VERSION +++ b/siriuspy/siriuspy/VERSION @@ -1 +1 @@ -1.20.0 +1.20.1 diff --git a/siriuspy/siriuspy/devices/device.py b/siriuspy/siriuspy/devices/device.py index a2fa31e2b..4bc11b5f7 100644 --- a/siriuspy/siriuspy/devices/device.py +++ b/siriuspy/siriuspy/devices/device.py @@ -185,7 +185,8 @@ def __init__(self, devname, devices): self._properties = [] for dev in self._devices: - self._properties += dev.properties + if dev is not None: + self._properties += dev.properties @property def devname(self):