Merged r5547:5542 from jcorgan/num into trunk. Converts from using Python Numeric...

[debian/gnuradio] / gnuradio-core / src / python / gnuradio / blksimpl2 / gmsk.py

diff --git a/gnuradio-core/src/python/gnuradio/blksimpl2/gmsk.py b/gnuradio-core/src/python/gnuradio/blksimpl2/gmsk.py
index bc601e67975ce01b1b822e5f001e5d9cfa8f80b0..72b53ca6ed443b3770f0bc9316a86d647aa2e12f 100644 (file)
--- a/gnuradio-core/src/python/gnuradio/blksimpl2/gmsk.py
+++ b/gnuradio-core/src/python/gnuradio/blksimpl2/gmsk.py
@@ -27,7 +27,7 @@
 from gnuradio import gr
 from gnuradio import modulation_utils
 from math import pi
-import Numeric
+import numpy
 from pprint import pprint
 import inspect
 
@@ -97,7 +97,7 @@ class gmsk_mod(gr.hier_block2):
                )
 
        self.sqwave = (1,) * samples_per_symbol       # rectangular window
-       self.taps = Numeric.convolve(Numeric.array(self.gaussian_taps),Numeric.array(self.sqwave))
+       self.taps = numpy.convolve(numpy.array(self.gaussian_taps),numpy.array(self.sqwave))
        self.gaussian_filter = gr.interp_fir_filter_fff(samples_per_symbol, self.taps)
 
        # FM modulation