summaryrefslogtreecommitdiff
path: root/gr-blocks
diff options
context:
space:
mode:
authorTom Rondeau <trondeau@vt.edu>2012-12-15 10:59:06 -0500
committerTom Rondeau <trondeau@vt.edu>2012-12-15 10:59:06 -0500
commitff84bec5bd5de512ac578be905ee19fc1422849b (patch)
treebf85107f60b80224fe68fddf5e56b1f2a5e3e349 /gr-blocks
parent461ece56b36a44b2405282630157739c7f9a26ba (diff)
blocks: fixing up metadata parser.
Diffstat (limited to 'gr-blocks')
-rw-r--r--gr-blocks/python/parse_file_metadata.py11
1 files changed, 8 insertions, 3 deletions
diff --git a/gr-blocks/python/parse_file_metadata.py b/gr-blocks/python/parse_file_metadata.py
index ec7bf6e804..c8ac2def94 100644
--- a/gr-blocks/python/parse_file_metadata.py
+++ b/gr-blocks/python/parse_file_metadata.py
@@ -22,11 +22,16 @@
import sys
from gnuradio import gr
-from gruel import pmt
+
+try:
+ import pmt
+except ImportError:
+ from gruel import pmt
+
try:
import blocks_swig as blocks
-except:
+except ImportError:
from gnuradio import blocks
'''
@@ -72,7 +77,7 @@ def parse_header(p, VERBOSE=False):
if(VERBOSE):
print "Version Number: {0}".format(version)
else:
- sys.stderr.write("Could not find key 'sr': invalid or corrupt data file.\n")
+ sys.stderr.write("Could not find key 'version': invalid or corrupt data file.\n")
sys.exit(1)
# EXTRACT SAMPLE RATE