From b6f2b4138be9dc9d250dda819f901872c13876be Mon Sep 17 00:00:00 2001
From: Tom Rondeau
Date: Fri, 23 Sep 2011 17:02:45 -0400
Subject: qtgui: fixing import statements in qtgui apps to print an error if
 extra python modules are not available.

---
 gr-qtgui/apps/pyqt_example_c.py | 32 +++++++++++++++++++++++++++++---
 gr-qtgui/apps/pyqt_example_f.py | 32 +++++++++++++++++++++++++++++---
 gr-qtgui/apps/pyqt_time_c.py    | 32 +++++++++++++++++++++++++++++---
 gr-qtgui/apps/pyqt_time_f.py    | 32 +++++++++++++++++++++++++++++---
 gr-qtgui/apps/qt_digital.py     | 39 +++++++++++++++++++++++++++++++++++----
 gr-qtgui/apps/usrp2_display.py  |  2 +-
 gr-qtgui/apps/usrp_display.py   |  2 +-
 7 files changed, 153 insertions(+), 18 deletions(-)

diff --git a/gr-qtgui/apps/pyqt_example_c.py b/gr-qtgui/apps/pyqt_example_c.py
index 607ab12ee..553d346c9 100755
--- a/gr-qtgui/apps/pyqt_example_c.py
+++ b/gr-qtgui/apps/pyqt_example_c.py
@@ -1,9 +1,35 @@
 #!/usr/bin/env python
+#
+# Copyright 2011 Free Software Foundation, Inc.
+# 
+# This file is part of GNU Radio
+# 
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+# 
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+# 
 
 from gnuradio import gr
-from gnuradio import qtgui
-from PyQt4 import QtGui, QtCore
-import sys, sip
+import sys
+
+try:
+    from gnuradio import qtgui
+    from PyQt4 import QtGui, QtCore
+    import sip
+except ImportError:
+    print "Error: Program requires PyQt4 and gr-qtgui."
+    sys.exit(1)
 
 class dialog_box(QtGui.QWidget):
     def __init__(self, display, control):
diff --git a/gr-qtgui/apps/pyqt_example_f.py b/gr-qtgui/apps/pyqt_example_f.py
index 2d957c85a..5e432fe78 100755
--- a/gr-qtgui/apps/pyqt_example_f.py
+++ b/gr-qtgui/apps/pyqt_example_f.py
@@ -1,9 +1,35 @@
 #!/usr/bin/env python
+#
+# Copyright 2011 Free Software Foundation, Inc.
+# 
+# This file is part of GNU Radio
+# 
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+# 
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+# 
 
 from gnuradio import gr
-from gnuradio import qtgui
-from PyQt4 import QtGui, QtCore
-import sys, sip
+import sys
+
+try:
+    from gnuradio import qtgui
+    from PyQt4 import QtGui, QtCore
+    import sip
+except ImportError:
+    print "Error: Program requires PyQt4 and gr-qtgui."
+    sys.exit(1)
 
 class dialog_box(QtGui.QWidget):
     def __init__(self, display, control):
diff --git a/gr-qtgui/apps/pyqt_time_c.py b/gr-qtgui/apps/pyqt_time_c.py
index fa7d60e81..a47302d19 100755
--- a/gr-qtgui/apps/pyqt_time_c.py
+++ b/gr-qtgui/apps/pyqt_time_c.py
@@ -1,9 +1,35 @@
 #!/usr/bin/env python
+#
+# Copyright 2011 Free Software Foundation, Inc.
+# 
+# This file is part of GNU Radio
+# 
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+# 
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+# 
 
 from gnuradio import gr
-from gnuradio import qtgui
-from PyQt4 import QtGui, QtCore
-import sys, sip
+import sys
+
+try:
+    from gnuradio import qtgui
+    from PyQt4 import QtGui, QtCore
+    import sip
+except ImportError:
+    print "Error: Program requires PyQt4 and gr-qtgui."
+    sys.exit(1)
 
 class dialog_box(QtGui.QWidget):
     def __init__(self, display, control):
diff --git a/gr-qtgui/apps/pyqt_time_f.py b/gr-qtgui/apps/pyqt_time_f.py
index 1b9efa10d..835b42a75 100755
--- a/gr-qtgui/apps/pyqt_time_f.py
+++ b/gr-qtgui/apps/pyqt_time_f.py
@@ -1,9 +1,35 @@
 #!/usr/bin/env python
+#
+# Copyright 2011 Free Software Foundation, Inc.
+# 
+# This file is part of GNU Radio
+# 
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+# 
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+# 
 
 from gnuradio import gr
-from gnuradio import qtgui
-from PyQt4 import QtGui, QtCore
-import sys, sip
+import sys
+
+try:
+    from gnuradio import qtgui
+    from PyQt4 import QtGui, QtCore
+    import sip
+except ImportError:
+    print "Error: Program requires PyQt4 and gr-qtgui."
+    sys.exit(1)
 
 class dialog_box(QtGui.QWidget):
     def __init__(self, display, control):
diff --git a/gr-qtgui/apps/qt_digital.py b/gr-qtgui/apps/qt_digital.py
index 99c799f2a..2bc039a31 100755
--- a/gr-qtgui/apps/qt_digital.py
+++ b/gr-qtgui/apps/qt_digital.py
@@ -1,11 +1,42 @@
 #!/usr/bin/env python
+#
+# Copyright 2011 Free Software Foundation, Inc.
+# 
+# This file is part of GNU Radio
+# 
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+# 
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+# 
 
 from gnuradio import gr, blks2
-from gnuradio import qtgui
 from gnuradio import eng_notation
-from PyQt4 import QtGui, QtCore
-import sys, sip
-import scipy
+import sys
+
+try:
+    from gnuradio import qtgui
+    from PyQt4 import QtGui, QtCore
+    import sip
+except ImportError:
+    print "Error: Program requires PyQt4 and gr-qtgui."
+    sys.exit(1)
+
+try:
+    import scipy
+except ImportError:
+    print "Error: Program requires scipy (see: www.scipy.org)."
+    sys.exit(1)
 
 try:
     from qt_digital_window import Ui_DigitalWindow
diff --git a/gr-qtgui/apps/usrp2_display.py b/gr-qtgui/apps/usrp2_display.py
index ab1a6f742..497bcc00e 100755
--- a/gr-qtgui/apps/usrp2_display.py
+++ b/gr-qtgui/apps/usrp2_display.py
@@ -33,7 +33,7 @@ try:
     from PyQt4 import QtGui, QtCore
     import sip
 except ImportError:
-    print "Please install gr-qtgui."
+    print "Error: Program requires PyQt4 and gr-qtgui."
     sys.exit(1)
 
 try:
diff --git a/gr-qtgui/apps/usrp_display.py b/gr-qtgui/apps/usrp_display.py
index 131bc4a7e..888bb6338 100755
--- a/gr-qtgui/apps/usrp_display.py
+++ b/gr-qtgui/apps/usrp_display.py
@@ -33,7 +33,7 @@ try:
     from PyQt4 import QtGui, QtCore
     import sip
 except ImportError:
-    print "Please install gr-qtgui."
+    print "Error: Program requires PyQt4 and gr-qtgui."
     sys.exit(1)
 
 try:
-- 
cgit 


From 801465fe8dbac9905ac74aeb5c3dc308d3328d98 Mon Sep 17 00:00:00 2001
From: Tom Rondeau
Date: Fri, 23 Sep 2011 17:03:32 -0400
Subject: examples: fixed examples (pfb and tags) to print an error when python
 modules are not available.

---
 gnuradio-examples/python/pfb/channelize.py       | 19 ++++++++---
 gnuradio-examples/python/pfb/chirp_channelize.py | 19 ++++++++---
 gnuradio-examples/python/pfb/decimate.py         | 23 ++++++++-----
 gnuradio-examples/python/pfb/fmtest.py           | 42 ++++++++++++++++++++----
 gnuradio-examples/python/pfb/interpolate.py      | 23 ++++++++-----
 gnuradio-examples/python/pfb/resampler.py        | 34 ++++++++++++++++++-
 gnuradio-examples/python/pfb/synth_filter.py     | 14 +++++++-
 gnuradio-examples/python/pfb/synth_to_chan.py    | 14 +++++++-
 gnuradio-examples/python/tags/test_file_tags.py  | 28 +++++++++++++++-
 9 files changed, 181 insertions(+), 35 deletions(-)

diff --git a/gnuradio-examples/python/pfb/channelize.py b/gnuradio-examples/python/pfb/channelize.py
index f845c05c6..999e5d20e 100755
--- a/gnuradio-examples/python/pfb/channelize.py
+++ b/gnuradio-examples/python/pfb/channelize.py
@@ -21,10 +21,21 @@
 # 
 
 from gnuradio import gr, blks2
-import os, time
-import scipy, pylab
-from scipy import fftpack
-from pylab import mlab
+import sys, time
+
+try:
+    import scipy
+    from scipy import fftpack
+except ImportError:
+    print "Error: Program requires scipy (see: www.scipy.org)."
+    sys.exit(1)
+
+try:
+    import pylab
+    from pylab import mlab
+except ImportError:
+    print "Error: Program requires matplotlib (see: matplotlib.sourceforge.net)."
+    sys.exit(1)
 
 class pfb_top_block(gr.top_block):
     def __init__(self):
diff --git a/gnuradio-examples/python/pfb/chirp_channelize.py b/gnuradio-examples/python/pfb/chirp_channelize.py
index edebf5f59..951255d3b 100755
--- a/gnuradio-examples/python/pfb/chirp_channelize.py
+++ b/gnuradio-examples/python/pfb/chirp_channelize.py
@@ -21,10 +21,21 @@
 # 
 
 from gnuradio import gr, blks2
-import os, time
-import scipy, pylab
-from scipy import fftpack
-from pylab import mlab
+import sys, time
+
+try:
+    import scipy
+    from scipy import fftpack
+except ImportError:
+    print "Error: Program requires scipy (see: www.scipy.org)."
+    sys.exit(1)
+
+try:
+    import pylab
+    from pylab import mlab
+except ImportError:
+    print "Error: Program requires matplotlib (see: matplotlib.sourceforge.net)."
+    sys.exit(1)
 
 class pfb_top_block(gr.top_block):
     def __init__(self):
diff --git a/gnuradio-examples/python/pfb/decimate.py b/gnuradio-examples/python/pfb/decimate.py
index cb5d61b72..643a2c241 100755
--- a/gnuradio-examples/python/pfb/decimate.py
+++ b/gnuradio-examples/python/pfb/decimate.py
@@ -21,14 +21,21 @@
 # 
 
 from gnuradio import gr, blks2
-import os
-import scipy, pylab
-from scipy import fftpack
-from pylab import mlab
-import time
-
-#print os.getpid()
-#raw_input()
+import sys, time
+
+try:
+    import scipy
+    from scipy import fftpack
+except ImportError:
+    print "Error: Program requires scipy (see: www.scipy.org)."
+    sys.exit(1)
+
+try:
+    import pylab
+    from pylab import mlab
+except ImportError:
+    print "Error: Program requires matplotlib (see: matplotlib.sourceforge.net)."
+    sys.exit(1)
 
 class pfb_top_block(gr.top_block):
     def __init__(self):
diff --git a/gnuradio-examples/python/pfb/fmtest.py b/gnuradio-examples/python/pfb/fmtest.py
index 97df0e0f5..635ee4e9e 100755
--- a/gnuradio-examples/python/pfb/fmtest.py
+++ b/gnuradio-examples/python/pfb/fmtest.py
@@ -1,14 +1,42 @@
 #!/usr/bin/env python
 #
+# Copyright 2009 Free Software Foundation, Inc.
+# 
+# This file is part of GNU Radio
+# 
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+# 
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+# 
+
+from gnuradio import gr, blks2
+import sys, math, time
+
+try:
+    import scipy
+    from scipy import fftpack
+except ImportError:
+    print "Error: Program requires scipy (see: www.scipy.org)."
+    sys.exit(1)
+
+try:
+    import pylab
+except ImportError:
+    print "Error: Program requires matplotlib (see: matplotlib.sourceforge.net)."
+    sys.exit(1)
 
 
-from gnuradio import gr, eng_notation
-from gnuradio import blks2
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
-import math, time, sys, scipy, pylab
-from scipy import fftpack
-
 class fmtx(gr.hier_block2):
     def __init__(self, lo_freq, audio_rate, if_rate):
 
diff --git a/gnuradio-examples/python/pfb/interpolate.py b/gnuradio-examples/python/pfb/interpolate.py
index a7a2522f8..370cf26a7 100755
--- a/gnuradio-examples/python/pfb/interpolate.py
+++ b/gnuradio-examples/python/pfb/interpolate.py
@@ -21,14 +21,21 @@
 # 
 
 from gnuradio import gr, blks2
-import os
-import scipy, pylab
-from scipy import fftpack
-from pylab import mlab
-import time
-
-#print os.getpid()
-#raw_input()
+import sys, time
+
+try:
+    import scipy
+    from scipy import fftpack
+except ImportError:
+    print "Error: Program requires scipy (see: www.scipy.org)."
+    sys.exit(1)
+
+try:
+    import pylab
+    from pylab import mlab
+except ImportError:
+    print "Error: Program requires matplotlib (see: matplotlib.sourceforge.net)."
+    sys.exit(1)
 
 class pfb_top_block(gr.top_block):
     def __init__(self):
diff --git a/gnuradio-examples/python/pfb/resampler.py b/gnuradio-examples/python/pfb/resampler.py
index 6be7cf14e..7b296ca71 100755
--- a/gnuradio-examples/python/pfb/resampler.py
+++ b/gnuradio-examples/python/pfb/resampler.py
@@ -1,7 +1,39 @@
 #!/usr/bin/env python
+#
+# Copyright 2009 Free Software Foundation, Inc.
+# 
+# This file is part of GNU Radio
+# 
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+# 
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+# 
 
 from gnuradio import gr, blks2
-import scipy, pylab
+import sys
+
+try:
+    import scipy
+except ImportError:
+    print "Error: Program requires scipy (see: www.scipy.org)."
+    sys.exit(1)
+
+try:
+    import pylab
+except ImportError:
+    print "Error: Program requires matplotlib (see: matplotlib.sourceforge.net)."
+    sys.exit(1)
 
 class mytb(gr.top_block):
     def __init__(self, fs_in, fs_out, fc, N=10000):
diff --git a/gnuradio-examples/python/pfb/synth_filter.py b/gnuradio-examples/python/pfb/synth_filter.py
index a1562f9ea..074d9cb2c 100755
--- a/gnuradio-examples/python/pfb/synth_filter.py
+++ b/gnuradio-examples/python/pfb/synth_filter.py
@@ -21,7 +21,19 @@
 # 
 
 from gnuradio import gr, blks2
-import scipy, pylab
+import sys 
+
+try:
+    import scipy
+except ImportError:
+    print "Error: Program requires scipy (see: www.scipy.org)."
+    sys.exit(1)
+
+try:
+    import pylab
+except ImportError:
+    print "Error: Program requires matplotlib (see: matplotlib.sourceforge.net)."
+    sys.exit(1)
 
 def main():
     N = 1000000
diff --git a/gnuradio-examples/python/pfb/synth_to_chan.py b/gnuradio-examples/python/pfb/synth_to_chan.py
index 1beda1a54..7e454d903 100755
--- a/gnuradio-examples/python/pfb/synth_to_chan.py
+++ b/gnuradio-examples/python/pfb/synth_to_chan.py
@@ -21,7 +21,19 @@
 # 
 
 from gnuradio import gr, blks2
-import scipy, pylab
+import sys 
+
+try:
+    import scipy
+except ImportError:
+    print "Error: Program requires scipy (see: www.scipy.org)."
+    sys.exit(1)
+
+try:
+    import pylab
+except ImportError:
+    print "Error: Program requires matplotlib (see: matplotlib.sourceforge.net)."
+    sys.exit(1)
 
 def main():
     N = 1000000
diff --git a/gnuradio-examples/python/tags/test_file_tags.py b/gnuradio-examples/python/tags/test_file_tags.py
index 4ff4549ef..446986cd7 100755
--- a/gnuradio-examples/python/tags/test_file_tags.py
+++ b/gnuradio-examples/python/tags/test_file_tags.py
@@ -1,7 +1,33 @@
 #!/usr/bin/env python
+#
+# Copyright 2011 Free Software Foundation, Inc.
+# 
+# This file is part of GNU Radio
+# 
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+# 
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+# 
 
 from gnuradio import gr
-import scipy
+import sys
+
+try:
+    import scipy
+except ImportError:
+    print "Error: Program requires scipy (see: www.scipy.org)."
+    sys.exit(1)
 
 def main():
     data = scipy.arange(0, 32000, 1).tolist()
-- 
cgit 


From c802032c0198c872ee09b1ec93ce7531f654715c Mon Sep 17 00:00:00 2001
From: Tom Rondeau
Date: Fri, 23 Sep 2011 17:20:46 -0400
Subject: trellis: fixed import statements; fixed test_cpm to convert numpy
 stuff to types GNU Radio blocks can handle.

---
 gr-trellis/src/examples/fsm_utils.py |  7 ++++++-
 gr-trellis/src/examples/test_cpm.py  | 15 ++++++++++-----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/gr-trellis/src/examples/fsm_utils.py b/gr-trellis/src/examples/fsm_utils.py
index e3426637c..e9243f899 100755
--- a/gr-trellis/src/examples/fsm_utils.py
+++ b/gr-trellis/src/examples/fsm_utils.py
@@ -26,10 +26,15 @@ import math
 import sys
 import operator
 import numpy
-import scipy.linalg
 
 from gnuradio import trellis
 
+try:
+    import scipy.linalg
+except ImportError:
+    print "Error: Program requires scipy (see: www.scipy.org)."
+    sys.exit(1)
+
 
 
 ######################################################################
diff --git a/gr-trellis/src/examples/test_cpm.py b/gr-trellis/src/examples/test_cpm.py
index ec432d4ff..b5bdaae44 100755
--- a/gr-trellis/src/examples/test_cpm.py
+++ b/gr-trellis/src/examples/test_cpm.py
@@ -13,10 +13,15 @@ from gnuradio.gr import firdes
 from grc_gnuradio import blks2 as grc_blks2
 import math
 import numpy
-import scipy.stats
 import fsm_utils
 from gnuradio import trellis
 
+try:
+	import scipy.stats
+except ImportError:
+	print "Error: Program requires scipy (see: www.scipy.org)."
+	sys.exit(1)
+
 def run_test(seed,blocksize):
         tb = gr.top_block()
 
@@ -83,7 +88,7 @@ def run_test(seed,blocksize):
 	##################################################
 	# Blocks
 	##################################################
-	random_source_x_0 = gr.vector_source_b(data, False)
+	random_source_x_0 = gr.vector_source_b(data.tolist(), False)
 	gr_chunks_to_symbols_xx_0 = gr.chunks_to_symbols_bf((-1, 1), 1)
 	gr_interp_fir_filter_xxx_0 = gr.interp_fir_filter_fff(Q, p)
 	gr_frequency_modulator_fc_0 = gr.frequency_modulator_fc(2*math.pi*h*(1.0/Q))
@@ -96,9 +101,9 @@ def run_test(seed,blocksize):
         # only works for N=2, do it manually for N>2...
 	gr_fir_filter_xxx_0_0 = gr.fir_filter_ccc(Q, MF[0].conjugate())
 	gr_fir_filter_xxx_0_0_0 = gr.fir_filter_ccc(Q, MF[1].conjugate())
-	gr_streams_to_stream_0 = gr.streams_to_stream(gr.sizeof_gr_complex*1, N)
-	gr_skiphead_0 = gr.skiphead(gr.sizeof_gr_complex*1, N*(1+0))
-	viterbi = trellis.viterbi_combined_cb(f, head+blocksize+tail, 0, -1, N, constellation, trellis.TRELLIS_EUCLIDEAN)
+	gr_streams_to_stream_0 = gr.streams_to_stream(gr.sizeof_gr_complex*1, int(N))
+	gr_skiphead_0 = gr.skiphead(gr.sizeof_gr_complex*1, int(N*(1+0)))
+	viterbi = trellis.viterbi_combined_cb(f, head+blocksize+tail, 0, -1, int(N), constellation, trellis.TRELLIS_EUCLIDEAN)
 
         gr_vector_sink_x_0 = gr.vector_sink_b()
 
-- 
cgit 


From c825caf1a86c5cefd20fdd222d915011ef43fbae Mon Sep 17 00:00:00 2001
From: Tom Rondeau
Date: Fri, 23 Sep 2011 17:21:39 -0400
Subject: examples: fixed import statements.

---
 gnuradio-examples/python/ofdm/gr_plot_ofdm.py | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/gnuradio-examples/python/ofdm/gr_plot_ofdm.py b/gnuradio-examples/python/ofdm/gr_plot_ofdm.py
index e3b347189..b24855148 100755
--- a/gnuradio-examples/python/ofdm/gr_plot_ofdm.py
+++ b/gnuradio-examples/python/ofdm/gr_plot_ofdm.py
@@ -20,14 +20,24 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-import scipy, pylab, math
-import struct, sys
-from pylab import *
-from matplotlib.font_manager import fontManager, FontProperties
+import math, struct, sys
 from optparse import OptionParser
-from scipy import fftpack
 from math import log10
 
+try:
+    import scipy
+    from scipy import fftpack
+except ImportError:
+    print "Error: Program requires scipy (see: www.scipy.org)."
+    sys.exit(1)
+
+try:
+    from pylab import *
+    from matplotlib.font_manager import fontManager, FontProperties
+except ImportError:
+    print "Error: Program requires matplotlib (see: matplotlib.sourceforge.net)."
+    sys.exit(1)
+
 matplotlib.interactive(True)
 matplotlib.use('TkAgg')
 
-- 
cgit 


From 9479dac98e305441fbbb0121836c98d8106369dc Mon Sep 17 00:00:00 2001
From: Johnathan Corgan
Date: Tue, 26 Jul 2011 16:49:17 -0700
Subject: comedi: fix to use comedi 0.8 API

(this was done on master but not maint, backporting)
---
 config/grc_gr_comedi.m4          | 2 +-
 gr-comedi/src/comedi_sink_s.cc   | 2 +-
 gr-comedi/src/comedi_source_s.cc | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/grc_gr_comedi.m4 b/config/grc_gr_comedi.m4
index 5e3089417..7e54b0f5a 100644
--- a/config/grc_gr_comedi.m4
+++ b/config/grc_gr_comedi.m4
@@ -29,7 +29,7 @@ AC_DEFUN([GRC_GR_COMEDI],[
     dnl   no   : otherwise
     if test $passed = yes; then
         dnl Don't do gr-comedi if the 'comedi' library is unavailable.
-        PKG_CHECK_MODULES(COMEDI, comedilib < 0.8,[],
+        PKG_CHECK_MODULES(COMEDI, comedilib >= 0.8,[],
             [passed=no;AC_MSG_RESULT([gr-comedi requires comedilib, not found.])])
     fi
 
diff --git a/gr-comedi/src/comedi_sink_s.cc b/gr-comedi/src/comedi_sink_s.cc
index d4a668758..fc5c14931 100644
--- a/gr-comedi/src/comedi_sink_s.cc
+++ b/gr-comedi/src/comedi_sink_s.cc
@@ -88,7 +88,7 @@ comedi_sink_s::comedi_sink_s (int sampling_freq,
   comedi_cmd cmd;
   int ret;
 
-  ret = comedi_get_cmd_generic_timed(d_dev,d_subdevice,&cmd,(unsigned int)(1e9/sampling_freq));
+  ret = comedi_get_cmd_generic_timed(d_dev,d_subdevice,&cmd,d_n_chan,(unsigned int)(1e9/sampling_freq));
   if(ret<0)
     bail ("comedi_get_cmd_generic_timed", comedi_errno());
 
diff --git a/gr-comedi/src/comedi_source_s.cc b/gr-comedi/src/comedi_source_s.cc
index a52d04e2a..5d9f2f6b0 100644
--- a/gr-comedi/src/comedi_source_s.cc
+++ b/gr-comedi/src/comedi_source_s.cc
@@ -85,7 +85,7 @@ comedi_source_s::comedi_source_s (int sampling_freq,
   comedi_cmd cmd;
   int ret;
 
-  ret = comedi_get_cmd_generic_timed(d_dev,d_subdevice,&cmd,(unsigned int)(1e9/sampling_freq));
+  ret = comedi_get_cmd_generic_timed(d_dev,d_subdevice,&cmd,d_n_chan,(unsigned int)(1e9/sampling_freq));
   if(ret<0)
     bail ("comedi_get_cmd_generic_timed", comedi_errno());
 
-- 
cgit