diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2015-04-04 10:41:49 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2015-04-04 10:41:49 -0700 |
| commit | 61c4e2f62d18b3b2f0663b8c0a54a105d3896883 (patch) | |
| tree | 1ee92dc79a2d257c45e0b32a470833057344cdea /grc/python/Param.py | |
| parent | 0e4f02cfee57c73712a8bb21b408d69d9fcfe1b9 (diff) | |
| parent | fa2abde0a0c9c1430ca1c4bb470ddb35e18c0ee2 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'grc/python/Param.py')
| -rw-r--r-- | grc/python/Param.py | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/grc/python/Param.py b/grc/python/Param.py index 827355d8d6..0e72fcbfb2 100644 --- a/grc/python/Param.py +++ b/grc/python/Param.py @@ -57,7 +57,7 @@ class Param(_Param, _GUIParam): 'complex', 'real', 'float', 'int', 'complex_vector', 'real_vector', 'float_vector', 'int_vector', 'hex', 'string', 'bool', - 'file_open', 'file_save', + 'file_open', 'file_save', 'multiline', 'id', 'stream_id', 'grid_pos', 'notebook', 'gui_hint', 'import', @@ -206,14 +206,6 @@ class Param(_Param, _GUIParam): self._lisitify_flag = False self._stringify_flag = False self._hostage_cells = list() - def eval_string(v): - try: - e = self.get_parent().get_parent().evaluate(v) - if isinstance(e, str): return e - raise Exception #want to stringify - except: - self._stringify_flag = True - return v t = self.get_type() v = self.get_value() ######################### @@ -280,9 +272,15 @@ class Param(_Param, _GUIParam): ######################### # String Types ######################### - elif t in ('string', 'file_open', 'file_save'): + elif t in ('string', 'file_open', 'file_save', 'multiline'): #do not check if file/directory exists, that is a runtime issue - e = eval_string(v) + try: + e = self.get_parent().get_parent().evaluate(v) + if not isinstance(e, str): + raise Exception() + except: + self._stringify_flag = True + e = v return str(e) ######################### # Unique ID Type @@ -413,7 +411,7 @@ class Param(_Param, _GUIParam): """ v = self.get_value() t = self.get_type() - if t in ('string', 'file_open', 'file_save'): #string types + if t in ('string', 'file_open', 'file_save', 'multiline'): #string types if not self._init: self.evaluate() if self._stringify_flag: return '"%s"'%v.replace('"', '\"') else: return v |