[Commit-gnuradio] [gnuradio] 05/05: grc: remove bypassed blocks from generated code

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 6cf003dcabf68324f507577bcf4f3c40231b9d2e
Author: Sebastian Koslowski <address@hidden>
Date:   Wed Aug 5 11:00:30 2015 +0200

    grc: remove bypassed blocks from generated code
---
 grc/base/Block.py       | 2 --
 grc/python/Generator.py | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/grc/base/Block.py b/grc/base/Block.py
index 5e8a717..2a20c22 100644
--- a/grc/base/Block.py
+++ b/grc/base/Block.py
@@ -27,8 +27,6 @@ from Cheetah.Template import Template
 from UserDict import UserDict
 from itertools import imap
 
-from .. gui import Messages
-
 
 class TemplateArg(UserDict):
     """
diff --git a/grc/python/Generator.py b/grc/python/Generator.py
index 38a5052..a7d0fb6 100644
--- a/grc/python/Generator.py
+++ b/grc/python/Generator.py
@@ -168,7 +168,7 @@ class TopBlockGenerator(object):
             return code
 
         blocks = expr_utils.sort_objects(
-            self._flow_graph.get_enabled_blocks(),
+            filter(lambda b: b.get_enabled() and not b.get_bypassed(), 
self._flow_graph.get_blocks()),
             lambda b: b.get_id(), _get_block_sort_text
         )
         # List of regular blocks (all blocks minus the special ones)