diff options
| author | Andrej Rode <mail@andrejro.de> | 2017-12-04 00:47:42 +0100 |
|---|---|---|
| committer | Andrej Rode <mail@andrejro.de> | 2017-12-04 00:47:42 +0100 |
| commit | 6ca908b8be68a1ced5849f6fcbe06086ce7584ce (patch) | |
| tree | 202158e132d11b797bfe342e58a0d11b054d66b1 | |
| parent | 11e90f0fd4ba7151fee6be1886de57829bdbbab4 (diff) | |
grc: check evaluated parameter for correctness
| -rw-r--r-- | grc/core/params/dtypes.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/grc/core/params/dtypes.py b/grc/core/params/dtypes.py index cddfdefe45..f52868c080 100644 --- a/grc/core/params/dtypes.py +++ b/grc/core/params/dtypes.py @@ -88,9 +88,9 @@ def validate_stream_id(param): @validates('complex', 'real', 'float', 'int') def validate_scalar(param): valid_types = Constants.PARAM_TYPE_MAP[param.dtype] - if not isinstance(param.value, valid_types): + if not isinstance(param.get_evaluated(), valid_types): raise ValidateError('Expression {!r} is invalid for type {!r}.'.format( - param.value, param.dtype)) + param.get_evaluated(), param.dtype)) @validates('complex_vector', 'real_vector', 'float_vector', 'int_vector') @@ -98,6 +98,6 @@ def validate_vector(param): # todo: check vector types valid_types = Constants.PARAM_TYPE_MAP[param.dtype.split('_', 1)[0]] - if not all(isinstance(item, valid_types) for item in param.value): + if not all(isinstance(item, valid_types) for item in param.get_evaluated()): raise ValidateError('Expression {!r} is invalid for type {!r}.'.format( - param.value, param.dtype)) + param.get_evaluated(), param.dtype)) |