diff options
| author | Douglas Anderson <danderson@ntia.doc.gov> | 2017-02-12 15:52:19 -0800 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-02-26 18:21:22 -0800 |
| commit | 9e625c4821f4c63421b3d3747c0c4f358fef6c5f (patch) | |
| tree | 41dedbe053417be7314cdce15d64fbbb89db4d8d /gr-audio/examples/python | |
| parent | e5aabcc6a4a9335f3ef8abf5f89104b626e9364d (diff) | |
python3: update non-GRC components to use python2 or python3
Diffstat (limited to 'gr-audio/examples/python')
| -rw-r--r--[-rwxr-xr-x] | gr-audio/examples/python/audio_copy.py | 1 | ||||
| -rw-r--r--[-rwxr-xr-x] | gr-audio/examples/python/audio_play.py | 1 | ||||
| -rw-r--r--[-rwxr-xr-x] | gr-audio/examples/python/audio_to_file.py | 1 | ||||
| -rw-r--r--[-rwxr-xr-x] | gr-audio/examples/python/dial_tone.py | 1 | ||||
| -rw-r--r--[-rwxr-xr-x] | gr-audio/examples/python/dial_tone_daemon.py | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | gr-audio/examples/python/dial_tone_wav.py | 1 | ||||
| -rw-r--r--[-rwxr-xr-x] | gr-audio/examples/python/mono_tone.py | 1 | ||||
| -rw-r--r--[-rwxr-xr-x] | gr-audio/examples/python/multi_tone.py | 12 | ||||
| -rw-r--r--[-rwxr-xr-x] | gr-audio/examples/python/noise.py | 1 | ||||
| -rw-r--r--[-rwxr-xr-x] | gr-audio/examples/python/spectrum_inversion.py | 1 | ||||
| -rw-r--r--[-rwxr-xr-x] | gr-audio/examples/python/test_resampler.py | 11 |
11 files changed, 25 insertions, 10 deletions
diff --git a/gr-audio/examples/python/audio_copy.py b/gr-audio/examples/python/audio_copy.py index b68e949497..5909be6508 100755..100644 --- a/gr-audio/examples/python/audio_copy.py +++ b/gr-audio/examples/python/audio_copy.py @@ -20,6 +20,7 @@ # Boston, MA 02110-1301, USA. # +from __future__ import unicode_literals from gnuradio import gr from gnuradio import audio from gnuradio.eng_arg import eng_float diff --git a/gr-audio/examples/python/audio_play.py b/gr-audio/examples/python/audio_play.py index 367d7bd201..7d551cc18a 100755..100644 --- a/gr-audio/examples/python/audio_play.py +++ b/gr-audio/examples/python/audio_play.py @@ -20,6 +20,7 @@ # Boston, MA 02110-1301, USA. # +from __future__ import unicode_literals from gnuradio import gr from gnuradio import audio from gnuradio import blocks diff --git a/gr-audio/examples/python/audio_to_file.py b/gr-audio/examples/python/audio_to_file.py index b385abf925..e35bb70382 100755..100644 --- a/gr-audio/examples/python/audio_to_file.py +++ b/gr-audio/examples/python/audio_to_file.py @@ -20,6 +20,7 @@ # Boston, MA 02110-1301, USA. # +from __future__ import unicode_literals from gnuradio import gr from gnuradio import audio from gnuradio import blocks diff --git a/gr-audio/examples/python/dial_tone.py b/gr-audio/examples/python/dial_tone.py index ebef8c01cb..98a75e6bb5 100755..100644 --- a/gr-audio/examples/python/dial_tone.py +++ b/gr-audio/examples/python/dial_tone.py @@ -20,6 +20,7 @@ # Boston, MA 02110-1301, USA. # +from __future__ import unicode_literals from gnuradio import gr from gnuradio import audio from gnuradio.eng_arg import eng_float diff --git a/gr-audio/examples/python/dial_tone_daemon.py b/gr-audio/examples/python/dial_tone_daemon.py index 9919e367a6..932ae07d4f 100755..100644 --- a/gr-audio/examples/python/dial_tone_daemon.py +++ b/gr-audio/examples/python/dial_tone_daemon.py @@ -20,6 +20,8 @@ # Boston, MA 02110-1301, USA. # +from __future__ import print_function +from __future__ import unicode_literals from gnuradio import gr, gru from gnuradio import audio from gnuradio.eng_arg import eng_float @@ -54,5 +56,5 @@ class my_top_block(gr.top_block): if __name__ == '__main__': pid = gru.daemonize() - print "To stop this program, enter 'kill %d'" % pid + print("To stop this program, enter 'kill %d'" % pid) my_top_block().run() diff --git a/gr-audio/examples/python/dial_tone_wav.py b/gr-audio/examples/python/dial_tone_wav.py index 351ca94e78..b9cf6bc510 100755..100644 --- a/gr-audio/examples/python/dial_tone_wav.py +++ b/gr-audio/examples/python/dial_tone_wav.py @@ -22,6 +22,7 @@ # GNU Radio example program to record a dial tone to a WAV file +from __future__ import unicode_literals from gnuradio import gr from gnuradio import blocks from gnuradio.eng_arg import eng_float diff --git a/gr-audio/examples/python/mono_tone.py b/gr-audio/examples/python/mono_tone.py index 653fd575fc..be86a4f6f4 100755..100644 --- a/gr-audio/examples/python/mono_tone.py +++ b/gr-audio/examples/python/mono_tone.py @@ -20,6 +20,7 @@ # Boston, MA 02110-1301, USA. # +from __future__ import unicode_literals from gnuradio import gr from gnuradio import audio from gnuradio.eng_arg import eng_float diff --git a/gr-audio/examples/python/multi_tone.py b/gr-audio/examples/python/multi_tone.py index 00c052794a..a2e8702a7a 100755..100644 --- a/gr-audio/examples/python/multi_tone.py +++ b/gr-audio/examples/python/multi_tone.py @@ -20,6 +20,8 @@ # Boston, MA 02110-1301, USA. # +from __future__ import division +from __future__ import unicode_literals from gnuradio import gr from gnuradio import audio from gnuradio.eng_arg import eng_float, intx @@ -59,11 +61,11 @@ class my_top_block(gr.top_block): # See "Genesis of a Music". He was into some very wild tunings... base = 392 ratios = { 1 : 1.0, - 3 : 3.0/2, - 5 : 5.0/4, - 7 : 7.0/4, - 9 : 9.0/8, - 11 : 11.0/8 } + 3 : 3.0 / 2, + 5 : 5.0 / 4, + 7 : 7.0 / 4, + 9 : 9.0 / 8, + 11 : 11.0 / 8 } # progression = (1, 5, 3, 7) # progression = (1, 9, 3, 7) diff --git a/gr-audio/examples/python/noise.py b/gr-audio/examples/python/noise.py index 31fdb16fe5..ee4e7f213c 100755..100644 --- a/gr-audio/examples/python/noise.py +++ b/gr-audio/examples/python/noise.py @@ -20,6 +20,7 @@ # Boston, MA 02110-1301, USA. # +from __future__ import unicode_literals from gnuradio import gr from gnuradio import audio from gnuradio import digital diff --git a/gr-audio/examples/python/spectrum_inversion.py b/gr-audio/examples/python/spectrum_inversion.py index 163668e450..f5d5a05b90 100755..100644 --- a/gr-audio/examples/python/spectrum_inversion.py +++ b/gr-audio/examples/python/spectrum_inversion.py @@ -26,6 +26,7 @@ # to a SSB signal on the wrong sideband. # +from __future__ import unicode_literals from gnuradio import gr from gnuradio import audio from gnuradio import blocks diff --git a/gr-audio/examples/python/test_resampler.py b/gr-audio/examples/python/test_resampler.py index 4d8a9233e7..daca7fc717 100755..100644 --- a/gr-audio/examples/python/test_resampler.py +++ b/gr-audio/examples/python/test_resampler.py @@ -20,6 +20,9 @@ # Boston, MA 02110-1301, USA. # +from __future__ import print_function +from __future__ import division +from __future__ import unicode_literals from gnuradio import gr, gru from gnuradio import audio from gnuradio import filter @@ -54,11 +57,11 @@ class my_top_block(gr.top_block): input_rate = int(args.input_rate) output_rate = int(args.output_rate) - interp = gru.lcm(input_rate, output_rate) / input_rate - decim = gru.lcm(input_rate, output_rate) / output_rate + interp = gru.lcm(input_rate / output_rate, input_rate) + decim = gru.lcm(input_rate / output_rate, output_rate) - print "interp =", interp - print "decim =", decim + print("interp =", interp) + print("decim =", decim) ampl = 0.1 src0 = analog.sig_source_f(input_rate, analog.GR_SIN_WAVE, 650, ampl) |