From ff84bec5bd5de512ac578be905ee19fc1422849b Mon Sep 17 00:00:00 2001
From: Tom Rondeau
Date: Sat, 15 Dec 2012 10:59:06 -0500
Subject: blocks: fixing up metadata parser.

---
 gr-blocks/python/parse_file_metadata.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/gr-blocks/python/parse_file_metadata.py b/gr-blocks/python/parse_file_metadata.py
index ec7bf6e80..c8ac2def9 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
-- 
cgit