From 79277e86f166839d475af9c759d332161e420e29 Mon Sep 17 00:00:00 2001 From: Markus Zolliker Date: Tue, 21 Mar 2023 09:02:35 +0100 Subject: [PATCH] fix generalConfig defaults bin/frappy-server: - the default for omit_unchanged_within must not be overriden + remove no longer used disable_value_range_check Change-Id: I5c0620e44dc7df3ae2ca48f7ab6371189acae489 Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30727 Tested-by: Jenkins Automated Tests Reviewed-by: Markus Zolliker --- bin/frappy-server | 5 +++-- frappy/params.py | 2 -- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/bin/frappy-server b/bin/frappy-server index 309c7c0..3d6993f 100755 --- a/bin/frappy-server +++ b/bin/frappy-server @@ -90,8 +90,9 @@ def main(argv=None): args = parseArgv(argv[1:]) loglevel = 'debug' if args.verbose else ('error' if args.quiet else 'info') - generalConfig.defaults = {k: args.relaxed for k in ( - 'lazy_number_validation', 'disable_value_range_check', 'legacy_hasiodev', 'tolerate_poll_property')} + generalConfig.set_default('lazy_number_validation', args.relaxed) + generalConfig.set_default('legacy_hasiodev', args.relaxed) + generalConfig.set_default('tolerate_poll_property', args.relaxed) generalConfig.init(args.gencfg) logger.init(loglevel) diff --git a/frappy/params.py b/frappy/params.py index 7f452d3..8310212 100644 --- a/frappy/params.py +++ b/frappy/params.py @@ -291,11 +291,9 @@ class Parameter(Accessible): if modobj: if self.update_unchanged == -1: t = modobj.omit_unchanged_within - print(self, t) self.omit_unchanged_within = generalConfig.omit_unchanged_within if t is None else t else: self.omit_unchanged_within = float(self.update_unchanged) - print(self, self.omit_unchanged_within, generalConfig.defaults, generalConfig._config) def export_value(self): return self.datatype.export_value(self.value)