interactive client: fix detection of overriding modules
+ add docstring to PrettyFloat Change-Id: Idc92e169e94d0c2bd3f9b8958870393295c87b18
This commit is contained in:
parent
b3eebb6c6a
commit
37c9efb27b
@ -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)
|
||||
|
Loading…
x
Reference in New Issue
Block a user