diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-07-25 08:33:08 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-07-25 08:33:08 -0700 |
| commit | 38be5bcc7928dd5f9ff19277c2bb12a3972e4c9a (patch) | |
| tree | db4dfe18cab09c213043922eee06bbb0e56a0f53 | |
| parent | 8843ffdf4b10c47acf843133af9491ab15ac72d4 (diff) | |
| parent | 1c122cbb5cdb1a979fc60e81646a39cbe7b89adf (diff) | |
Merge branch 'master' into next
| -rwxr-xr-x | gr-utils/python/utils/grcc | 14 | ||||
| -rw-r--r-- | grc/core/Param.py | 6 | ||||
| -rw-r--r-- | grc/gui/BlockTreeWindow.py | 6 | ||||
| -rw-r--r-- | grc/gui/Preferences.py | 4 |
4 files changed, 17 insertions, 13 deletions
diff --git a/gr-utils/python/utils/grcc b/gr-utils/python/utils/grcc index 776af799d3..e93802f051 100755 --- a/gr-utils/python/utils/grcc +++ b/gr-utils/python/utils/grcc @@ -26,16 +26,22 @@ from argparse import ArgumentParser import warnings warnings.simplefilter('ignore') +from gnuradio import gr + try: - from grc.python.Platform import Platform + from grc.core.Platform import Platform except ImportError: - from gnuradio.grc.python.Platform import Platform + from gnuradio.grc.core.Platform import Platform class GRCC: def __init__(self, grcfile, out_dir): self.out_dir = out_dir - self.platform = Platform() + self.platform = Platform( + prefs_file=gr.prefs(), + version=gr.version(), + version_parts=(gr.major_version(), gr.api_version(), gr.minor_version()) + ) data = self.platform.parse_flow_graph(grcfile) self.fg = self.platform.get_new_flow_graph() @@ -48,7 +54,7 @@ class GRCC: ["Validation failed:"] + self.fg.get_error_messages() )) - self.gen = self.platform.get_generator()(self.fg, out_dir) + self.gen = self.platform.Generator(self.fg, out_dir) self.gen.write() def exec_program(self): diff --git a/grc/core/Param.py b/grc/core/Param.py index d155800c43..201032d010 100644 --- a/grc/core/Param.py +++ b/grc/core/Param.py @@ -642,10 +642,8 @@ class Param(Element): if t in ('string', 'file_open', 'file_save', '_multiline', '_multiline_python_external'): if not self._init: self.evaluate() - if self._stringify_flag: - return '"%s"' % v.replace('"', '\"') - else: - return v + return repr(v) if self._stringify_flag else v + # Vector types elif t in ('complex_vector', 'real_vector', 'float_vector', 'int_vector'): if not self._init: diff --git a/grc/gui/BlockTreeWindow.py b/grc/gui/BlockTreeWindow.py index f49eb6c4fe..f0373eaf2a 100644 --- a/grc/gui/BlockTreeWindow.py +++ b/grc/gui/BlockTreeWindow.py @@ -202,10 +202,10 @@ class BlockTreeWindow(gtk.VBox): """Update the documentation column of every block""" def update_doc(model, _, iter_): - if model.iter_has_child(iter_): - return # category node, no doc string key = model.get_value(iter_, KEY_INDEX) - block = self.platform.blocks[key] + if not key: + return # category node, no doc string + block = self.platform.get_block(key) doc = Utils.parse_template(DOC_MARKUP_TMPL, doc=block.get_doc()) model.set_value(iter_, DOC_INDEX, doc) diff --git a/grc/gui/Preferences.py b/grc/gui/Preferences.py index 5fbdfe927a..d377018eb4 100644 --- a/grc/gui/Preferences.py +++ b/grc/gui/Preferences.py @@ -74,7 +74,7 @@ def entry(key, value=None, default=None): }.get(_type, _config_parser.get) try: result = getter('main', key) - except ConfigParser.Error: + except (AttributeError, ConfigParser.Error): result = _type() if default is None else default return result @@ -106,7 +106,7 @@ def get_file_list(key): try: files = [value for name, value in _config_parser.items(key) if name.startswith('%s_' % key)] - except ConfigParser.Error: + except (AttributeError, ConfigParser.Error): files = [] return files |