From c16adf38cd6c18db10b3445269dd12a7c1a50550 Mon Sep 17 00:00:00 2001 From: Markus Zolliker Date: Wed, 20 May 2020 16:49:49 +0200 Subject: [PATCH] HasIodev bug fix Change-Id: I2be3b477f7d6ca74f2fefb5efc1bd134ac8d047e Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/23124 Tested-by: JenkinsCodeReview Reviewed-by: Markus Zolliker --- secop/stringio.py | 2 +- secop_psi/ppms.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/secop/stringio.py b/secop/stringio.py index 68266f4..e08cc6b 100644 --- a/secop/stringio.py +++ b/secop/stringio.py @@ -208,7 +208,7 @@ class HasIodev(Module): iodevDict = {} def __init__(self, name, logger, opts, srv): - iodev = opts.pop('iodev', None) + iodev = opts.get('iodev') super().__init__(name, logger, opts, srv) if self.uri: opts = {'uri': self.uri, 'description': 'communication device for %s' % name, diff --git a/secop_psi/ppms.py b/secop_psi/ppms.py index dbc05e9..2c1848b 100644 --- a/secop_psi/ppms.py +++ b/secop_psi/ppms.py @@ -446,7 +446,6 @@ class Temp(PpmsMixin, Drivable): 15: (Status.ERROR, 'general failure'), } properties = { - 'iodev': Attached(), 'general_stop': Property('respect general stop', datatype=BoolType(), export=True, default=True) }