From 37c9efb27bc7df796f20ca443042c73bc09b679e Mon Sep 17 00:00:00 2001 From: Markus Zolliker Date: Mon, 7 Nov 2022 15:14:48 +0100 Subject: [PATCH] interactive client: fix detection of overriding modules + add docstring to PrettyFloat Change-Id: Idc92e169e94d0c2bd3f9b8958870393295c87b18 --- frappy/client/interactive.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/frappy/client/interactive.py b/frappy/client/interactive.py index cbaeced..6472015 100644 --- a/frappy/client/interactive.py +++ b/frappy/client/interactive.py @@ -75,6 +75,12 @@ class Logger: class PrettyFloat(float): + """float with a nicer repr: + + - numbers which are close to a fractional decimal number do not have + additional annoying digits + - always display a decimal point + """ def __repr__(self): result = '%.12g' % self if '.' in result or 'e' in result: @@ -247,7 +253,7 @@ class Client(SecopClient): if prev: prev.log.info('remove previous client to %s', uri) for modname in prev.modules: - prevnode = getattr(getattr(main, modname, None), 'secnode', None) + prevnode = getattr(getattr(main, modname, None), '_secnode', None) if prevnode == prev: prev.log.info('remove previous module %s', modname) delattr(main, modname) @@ -260,7 +266,7 @@ class Client(SecopClient): if prev is None: self.log.info('create module %s', modname) else: - if getattr(prev, 'secnode', None) is None: + if getattr(prev, '_secnode', None) is None: self.log.error('skip module %s overwriting a global variable' % modname) continue self.log.info('overwrite module %s', modname)