From 8c85a775a171f116c75d5c6b6ce9dc2e9409b055 Mon Sep 17 00:00:00 2001 From: Enrico Faulhaber Date: Tue, 4 Dec 2018 14:02:18 +0100 Subject: [PATCH] fix simulation got broken during change of signatures of modules Change-Id: Id423ac52fb1523ef207b08758fb941f0507eeec5 Reviewed-on: https://forge.frm2.tum.de/review/19535 Tested-by: JenkinsCodeReview Reviewed-by: Enrico Faulhaber Tested-by: Enrico Faulhaber --- secop/server.py | 3 +-- secop/simulation.py | 16 ++++++++-------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/secop/server.py b/secop/server.py index 3b7d134..9689084 100644 --- a/secop/server.py +++ b/secop/server.py @@ -168,8 +168,7 @@ class Server(object): try: opts[k] = ast.literal_eval(v) except Exception: - pass - opts[k] = v + opts[k] = v # try to import the class, raise if this fails self.log.debug(u'Creating %s %s ...' % (kind.title(), name)) diff --git a/secop/simulation.py b/secop/simulation.py index 7671d55..3ca3632 100644 --- a/secop/simulation.py +++ b/secop/simulation.py @@ -78,22 +78,22 @@ class SimBase(object): class SimModule(SimBase, Module): - def __init__(self, logger, cfgdict, devname, dispatcher): + def __init__(self, devname, logger, cfgdict, dispatcher): SimBase.__init__(self, cfgdict) - Module.__init__(self, logger, cfgdict, devname, dispatcher) + Module.__init__(self, devname, logger, cfgdict, dispatcher) class SimReadable(SimBase, Readable): - def __init__(self, logger, cfgdict, devname, dispatcher): + def __init__(self, devname, logger, cfgdict, dispatcher): SimBase.__init__(self, cfgdict) - Readable.__init__(self, logger, cfgdict, devname, dispatcher) + Readable.__init__(self, devname, logger, cfgdict, dispatcher) self._value = self.accessibles['value'].default class SimWritable(SimBase, Writable): - def __init__(self, logger, cfgdict, devname, dispatcher): + def __init__(self, devname, logger, cfgdict, dispatcher): SimBase.__init__(self, cfgdict) - Writable.__init__(self, logger, cfgdict, devname, dispatcher) + Writable.__init__(self, devname, logger, cfgdict, dispatcher) self._value = self.accessibles['value'].default def read_value(self, maxage=0): return self.target @@ -104,9 +104,9 @@ class SimWritable(SimBase, Writable): pass class SimDrivable(SimBase, Drivable): - def __init__(self, logger, cfgdict, devname, dispatcher): + def __init__(self, devname, logger, cfgdict, dispatcher): SimBase.__init__(self, cfgdict) - Drivable.__init__(self, logger, cfgdict, devname, dispatcher) + Drivable.__init__(self, devname, logger, cfgdict, dispatcher) self._value = self.accessibles['value'].default def sim(self):