[Commit-gnuradio] [gnuradio] 02/05: fix various python imports

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch maint
in repository gnuradio.

commit 819d544f6672c2ca17e1e8742c9f815ff129442c
Author: Jiří Pinkava <address@hidden>
Date:   Sun Jun 26 00:36:54 2016 +0200

    fix various python imports
---
 gnuradio-runtime/examples/mp-sched/wfm_rcv_pll_to_wav.py | 4 ++--
 gr-digital/examples/narrowband/benchmark_add_channel.py  | 4 ++--
 gr-digital/examples/ofdm/benchmark_add_channel.py        | 4 ++--
 gr-uhd/apps/hf_radio/radio.py                            | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/gnuradio-runtime/examples/mp-sched/wfm_rcv_pll_to_wav.py 
b/gnuradio-runtime/examples/mp-sched/wfm_rcv_pll_to_wav.py
index 7cf3210..1a43dc3 100755
--- a/gnuradio-runtime/examples/mp-sched/wfm_rcv_pll_to_wav.py
+++ b/gnuradio-runtime/examples/mp-sched/wfm_rcv_pll_to_wav.py
@@ -20,7 +20,7 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr, gru, eng_notation, optfir
+from gnuradio import gr, gru, eng_notation, filter
 from gnuradio import audio
 from gnuradio import analog
 from gnuradio import blocks
@@ -61,7 +61,7 @@ class wfm_rx_block (gr.top_block):
         audio_rate = demod_rate / audio_decimation  # 32 kHz
 
 
-        chan_filt_coeffs = optfir.low_pass (1,           # gain
+        chan_filt_coeffs = filter.optfir.low_pass (1,    # gain
                                             usrp_rate,   # sampling rate
                                             80e3,        # passband cutoff
                                             115e3,       # stopband cutoff
diff --git a/gr-digital/examples/narrowband/benchmark_add_channel.py 
b/gr-digital/examples/narrowband/benchmark_add_channel.py
index b614895..cd85f4e 100755
--- a/gr-digital/examples/narrowband/benchmark_add_channel.py
+++ b/gr-digital/examples/narrowband/benchmark_add_channel.py
@@ -20,7 +20,7 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, filter
+from gnuradio import channels, gr
 from gnuradio import blocks
 from gnuradio import eng_notation
 from gnuradio.eng_option import eng_option
@@ -45,7 +45,7 @@ class my_top_block(gr.top_block):
         self.src = blocks.file_source(gr.sizeof_gr_complex, ifile)
         #self.throttle = blocks.throttle(gr.sizeof_gr_complex, 
options.sample_rate)
 
-        self.channel = filter.channel_model(noise_voltage, frequency_offset,
+        self.channel = channels.channel_model(noise_voltage, frequency_offset,
                                             time_offset, 
noise_seed=-random.randint(0,100000))
         self.phase = blocks.multiply_const_cc(complex(math.cos(phase_offset),
                                                   math.sin(phase_offset)))
diff --git a/gr-digital/examples/ofdm/benchmark_add_channel.py 
b/gr-digital/examples/ofdm/benchmark_add_channel.py
index f97214f..0ac4698 100755
--- a/gr-digital/examples/ofdm/benchmark_add_channel.py
+++ b/gr-digital/examples/ofdm/benchmark_add_channel.py
@@ -20,7 +20,7 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, filter
+from gnuradio import gr, channels
 from gnuradio import blocks
 from gnuradio import eng_notation
 from gnuradio.eng_option import eng_option
@@ -47,7 +47,7 @@ class my_top_block(gr.top_block):
         self.src = blocks.file_source(gr.sizeof_gr_complex, ifile)
         #self.throttle = blocks.throttle(gr.sizeof_gr_complex, 
options.sample_rate)
 
-        self.channel = filter.channel_model(noise_voltage, frequency_offset,
+        self.channel = channels.channel_model(noise_voltage, frequency_offset,
                                         time_offset, 
noise_seed=-random.randint(0,100000))
         self.phase = blocks.multiply_const_cc(complex(math.cos(phase_offset),
                                                   math.sin(phase_offset)))
diff --git a/gr-uhd/apps/hf_radio/radio.py b/gr-uhd/apps/hf_radio/radio.py
index bbe2bfd..970ec01 100755
--- a/gr-uhd/apps/hf_radio/radio.py
+++ b/gr-uhd/apps/hf_radio/radio.py
@@ -31,7 +31,7 @@ import wx
 import wx.lib.evtmgr as em
 import time
 
-from gnuradio import gr, gru, eng_notation, optfir
+from gnuradio import gr, gru, eng_notation
 from gnuradio import audio
 from gnuradio import blocks
 from gnuradio import uhd