diff options
author | Tom Rondeau <trondeau@vt.edu> | 2013-03-29 17:31:06 -0400 |
---|---|---|
committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-01 16:23:06 -0700 |
commit | f74d3dae8f2ec423c61932b4ad0359f98b996a51 (patch) | |
tree | 1e16eb3537829248c177b04209acce3fe2bead96 /gnuradio-runtime/python/gnuradio/gr | |
parent | eea0e411411303ea94953c5cd8454c4139a474ff (diff) |
gruel: moved gruel into subdirs of gnuradio-runtime.
PMTs are handled slightly different and are installed into their own module and include dir.
Diffstat (limited to 'gnuradio-runtime/python/gnuradio/gr')
-rw-r--r-- | gnuradio-runtime/python/gnuradio/gr/hier_block2.py | 6 | ||||
-rw-r--r-- | gnuradio-runtime/python/gnuradio/gr/tag_utils.py | 3 |
2 files changed, 2 insertions, 7 deletions
diff --git a/gnuradio-runtime/python/gnuradio/gr/hier_block2.py b/gnuradio-runtime/python/gnuradio/gr/hier_block2.py index 31e4065a25..a254a58c72 100644 --- a/gnuradio-runtime/python/gnuradio/gr/hier_block2.py +++ b/gnuradio-runtime/python/gnuradio/gr/hier_block2.py @@ -20,11 +20,7 @@ # from runtime_swig import hier_block2_swig - -try: - import pmt -except ImportError: - from gruel import pmt +import pmt # # This hack forces a 'has-a' relationship to look like an 'is-a' one. diff --git a/gnuradio-runtime/python/gnuradio/gr/tag_utils.py b/gnuradio-runtime/python/gnuradio/gr/tag_utils.py index 1c9594d6d0..8de7110e3f 100644 --- a/gnuradio-runtime/python/gnuradio/gr/tag_utils.py +++ b/gnuradio-runtime/python/gnuradio/gr/tag_utils.py @@ -20,8 +20,7 @@ # """ Conversion tools between stream tags and Python objects """ -try: import pmt -except: from gruel import pmt +import pmt try: from gnuradio import gr |