From babd4a5438f19d2590444bc3d25e1da545732b4f Mon Sep 17 00:00:00 2001 From: Roman Zeyde Date: Fri, 16 Jan 2015 09:50:29 +0200 Subject: [PATCH] common: move AttributeHolder --- amodem/calib.py | 7 +------ amodem/common.py | 9 +++++++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/amodem/calib.py b/amodem/calib.py index 9094842..1144aa0 100644 --- a/amodem/calib.py +++ b/amodem/calib.py @@ -66,7 +66,7 @@ def detector(config, src): error_index = flags.index(False) message = 'too {0} signal'.format(errors[error_index]) - yield AttributeHolder(dict( + yield common.AttributeHolder(dict( freq=freq, rms=rms, peak=peak, coherency=coherency, total=total, error=error, message=message )) @@ -74,11 +74,6 @@ def detector(config, src): pass -class AttributeHolder(object): - def __init__(self, d): - self.__dict__.update(d) - - def recv(config, src, verbose=False): fmt = '{0.freq:6.0f} Hz: {0.message:s}' if verbose: diff --git a/amodem/common.py b/amodem/common.py index 57c2a00..2fda33c 100644 --- a/amodem/common.py +++ b/amodem/common.py @@ -72,3 +72,12 @@ class Dummy(object): def __call__(self, *args, **kwargs): return self + + +class AttributeHolder(object): + + def __init__(self, d): + self.__dict__.update(d) + + def __repr__(self): + return '{}({})'.format(self.__class__.__name__, self.__dict__)