diff options
| author | jblum <jblum@221aa14e-8319-0410-a670-987f0aec2ac5> | 2009-05-01 20:28:04 +0000 |
|---|---|---|
| committer | jblum <jblum@221aa14e-8319-0410-a670-987f0aec2ac5> | 2009-05-01 20:28:04 +0000 |
| commit | a3ba8cf268816af51c4bb39ea7ecd7e85ea0807b (patch) | |
| tree | 21dbd446e92672a56b323e005088d3c03edc238f /grc/src/platforms/python/Block.py | |
| parent | 6ce881caaacdd60a8bea37584c7286e08bea97a7 (diff) | |
Merged grc developer branch r10679:10938
Misc fixes and internal changes.
Added help menu for usage tips.
Added drag and drop for blocks.
Removed callback controls, adopted forms.
Any type can have enumerated options.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10941 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'grc/src/platforms/python/Block.py')
| -rw-r--r-- | grc/src/platforms/python/Block.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/grc/src/platforms/python/Block.py b/grc/src/platforms/python/Block.py index 3c45117a3f..38a0ce4923 100644 --- a/grc/src/platforms/python/Block.py +++ b/grc/src/platforms/python/Block.py @@ -19,7 +19,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA from .. base.Block import Block as _Block from utils import extract_docs -from ... import utils class Block(_Block): @@ -36,11 +35,11 @@ class Block(_Block): @return block a new block """ #grab the data - doc = utils.exists_or_else(n, 'doc', '') - imports = map(lambda i: i.strip(), utils.listify(n, 'import')) - make = n['make'] - checks = utils.listify(n, 'check') - callbacks = utils.listify(n, 'callback') + doc = n.find('doc') or '' + imports = map(lambda i: i.strip(), n.findall('import')) + make = n.find('make') + checks = n.findall('check') + callbacks = n.findall('callback') #build the block _Block.__init__( self, |