diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2014-08-21 09:22:51 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2014-08-21 09:22:51 -0700 |
| commit | 60e657adac20652a9f99dc9b2384f0f9487cf67d (patch) | |
| tree | f7c13692e97a830941f14c7c4edb2a63368ab829 /grc/python | |
| parent | d07c98685c11641e3bbba16691f80855bc19b3c6 (diff) | |
| parent | bfd4787e1363f4b1c7d8d2441c55f7fc9d1f3323 (diff) | |
Merge branch 'maint'
Diffstat (limited to 'grc/python')
| -rw-r--r-- | grc/python/Platform.py | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/grc/python/Platform.py b/grc/python/Platform.py index f4f55e9d16..93527a11b9 100644 --- a/grc/python/Platform.py +++ b/grc/python/Platform.py @@ -18,7 +18,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA """ import os -from collections import OrderedDict from gnuradio import gr from .. base.Platform import Platform as _Platform from .. gui.Platform import Platform as _GUIPlatform @@ -36,17 +35,12 @@ import Constants COLORS = [(name, color) for name, key, sizeof, color in Constants.CORE_TYPES] class Platform(_Platform, _GUIPlatform): - def __init__(self): """ Make a platform for gnuradio. """ #ensure hier dir if not os.path.exists(HIER_BLOCKS_LIB_DIR): os.mkdir(HIER_BLOCKS_LIB_DIR) - # Convert block paths to absolute paths: - # - Create a mapping from the absolute path to what was passed in - # - Keep each unique absolute path and maintain order - block_paths = OrderedDict(map(lambda x: (os.path.abspath(x), x), BLOCKS_DIRS)) #init _Platform.__init__( self, @@ -55,7 +49,7 @@ class Platform(_Platform, _GUIPlatform): key='grc', license=__doc__.strip(), website='http://gnuradio.org/redmine/wiki/gnuradio/GNURadioCompanion', - block_paths=block_paths, + block_paths=BLOCKS_DIRS, block_dtd=BLOCK_DTD, default_flow_graph=DEFAULT_FLOW_GRAPH, generator=Generator, |