diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-02 16:02:33 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-02 16:02:33 -0700 |
| commit | eea870b1dd9c5b90dfa7d94e6a15ffe44cfbee7f (patch) | |
| tree | af3aa889c94cff9c503edefeaf19cb3635693bfb /gr-blocks/python | |
| parent | e648165dcc7609524681b5eaf9620798b75b8420 (diff) | |
| parent | 9acf35715fbb8aca5a991a3f41965db8f4cde683 (diff) | |
Merge branch 'runtime-gruel' into next
Conflicts:
gnuradio-runtime/lib/CMakeLists.txt
Diffstat (limited to 'gr-blocks/python')
| -rw-r--r-- | gr-blocks/python/parse_file_metadata.py | 7 | ||||
| -rw-r--r-- | gr-blocks/python/qa_python_message_passing.py | 3 |
2 files changed, 2 insertions, 8 deletions
diff --git a/gr-blocks/python/parse_file_metadata.py b/gr-blocks/python/parse_file_metadata.py index eaa8025bbf..a876f49b07 100644 --- a/gr-blocks/python/parse_file_metadata.py +++ b/gr-blocks/python/parse_file_metadata.py @@ -22,12 +22,7 @@ import sys from gnuradio import gr - -try: - import pmt -except ImportError: - from gruel import pmt - +import pmt try: import blocks_swig as blocks diff --git a/gr-blocks/python/qa_python_message_passing.py b/gr-blocks/python/qa_python_message_passing.py index f199d5470f..58bf9e59bd 100644 --- a/gr-blocks/python/qa_python_message_passing.py +++ b/gr-blocks/python/qa_python_message_passing.py @@ -21,8 +21,7 @@ # from gnuradio import gr, gr_unittest -try: import pmt -except: from gruel import pmt +import pmt import numpy import time import blocks_swig as blocks |