From 6b610f1e2589786d47a27260321fc75cec96615d Mon Sep 17 00:00:00 2001 From: Markus Zolliker Date: Mon, 5 Jul 2021 13:04:13 +0200 Subject: [PATCH] remove irrelevant comments + improve error message 'can not convert %r to float' Change-Id: Idf534a4105086463fd238d7c91317424a809d7ba Change-Id: I09260dda8deff1e6ee0af2fa38a42a09884a2061 Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/26345 Tested-by: Jenkins Automated Tests Reviewed-by: Markus Zolliker --- secop/datatypes.py | 2 +- secop/simulation.py | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/secop/datatypes.py b/secop/datatypes.py index 03b5fd2..8af2fb0 100644 --- a/secop/datatypes.py +++ b/secop/datatypes.py @@ -194,7 +194,7 @@ class FloatRange(DataType): try: value = float(value) except Exception: - raise BadValueError('Can not __call__ %r to float' % value) from None + raise BadValueError('Can not convert %r to float' % value) from None # map +/-infty to +/-max possible number value = clamp(-sys.float_info.max, value, sys.float_info.max) diff --git a/secop/simulation.py b/secop/simulation.py index b2747b9..ece98c6 100644 --- a/secop/simulation.py +++ b/secop/simulation.py @@ -22,8 +22,6 @@ """Define Simulation classes""" -# TODO: rework after syntax change! - import random from time import sleep @@ -40,8 +38,6 @@ class SimBase: extra_params = cfgdict.pop('extra_params', '') or cfgdict.pop('.extra_params', '') attrs = {} if extra_params: - # make a copy of self.parameter - # self.accessibles = dict((k, v.copy()) for k, v in self.accessibles.items()) for k in extra_params.split(','): k = k.strip() attrs[k] = Parameter('extra_param: %s' % k.strip(), @@ -82,14 +78,10 @@ class SimBase: class SimModule(SimBase, Module): pass - # def __init__(self, devname, logger, cfgdict, dispatcher): - # SimBase.__init__(self, cfgdict) - # Module.__init__(self, devname, logger, cfgdict, dispatcher) class SimReadable(SimBase, Readable): def __init__(self, devname, logger, cfgdict, dispatcher): - # SimBase.__init__(self, cfgdict) super().__init__(devname, logger, cfgdict, dispatcher) self._value = self.parameters['value'].default