diff --git a/bin/secop-server b/bin/secop-server index 4776545..d28a307 100755 --- a/bin/secop-server +++ b/bin/secop-server @@ -90,11 +90,8 @@ def main(argv=None): args = parseArgv(argv[1:]) loglevel = 'debug' if args.verbose else ('error' if args.quiet else 'info') - if args.relaxed: - generalConfig.defaults['lazy_number_validation'] = True - generalConfig.defaults['disable_value_range_check'] = True - generalConfig.defaults['legacy_hasiodev'] = True - generalConfig.defaults['tolerate_poll_property'] = True + generalConfig.defaults = {k: args.relaxed for k in ( + 'lazy_number_validation', 'disable_value_range_check', 'legacy_hasiodev', 'tolerate_poll_property')} generalConfig.init(args.gencfg) logger.init(loglevel) diff --git a/secop/datatypes.py b/secop/datatypes.py index f5c31c1..269590b 100644 --- a/secop/datatypes.py +++ b/secop/datatypes.py @@ -39,7 +39,6 @@ from secop.properties import HasProperties, Property DEFAULT_MIN_INT = -16777216 DEFAULT_MAX_INT = 16777216 UNLIMITED = 1 << 64 # internal limit for integers, is probably high enough for any datatype size -generalConfig.defaults['lazy_number_validation'] = False Parser = Parser() diff --git a/secop/io.py b/secop/io.py index 9aad8f8..0dde066 100644 --- a/secop/io.py +++ b/secop/io.py @@ -38,7 +38,6 @@ from secop.modules import Attached, Command, \ from secop.lib import generalConfig -generalConfig.defaults['legacy_hasiodev'] = False HEX_CODE = re.compile(r'[0-9a-fA-F][0-9a-fA-F]$') diff --git a/secop/modules.py b/secop/modules.py index 322fd0e..2032717 100644 --- a/secop/modules.py +++ b/secop/modules.py @@ -39,8 +39,6 @@ from secop.properties import HasProperties, Property from secop.logging import RemoteLogHandler, HasComlog -generalConfig.defaults['disable_value_range_check'] = False # check for problematic value range by default - Done = UniqueObject('Done') """a special return value for a read/write function