diff --git a/gr3.8.patch b/gr3.8.patch index 79e532c..5aaaa84 100644 --- a/gr3.8.patch +++ b/gr3.8.patch @@ -283,7 +283,7 @@ index 7cbf05b..73a861a 100755 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - from gnuradio import gr, gru, audio, eng_notation, blocks + from gnuradio import gr, audio, eng_notation, blocks from gnuradio.eng_option import eng_option from optparse import OptionParser diff --git a/op25/gr-op25_repeater/apps/util/arb-resample.py b/op25/gr-op25_repeater/apps/util/arb-resample.py diff --git a/op25/gr-op25_repeater/apps/gr_gnuplot.py b/op25/gr-op25_repeater/apps/gr_gnuplot.py index 2d349f4..290c590 100644 --- a/op25/gr-op25_repeater/apps/gr_gnuplot.py +++ b/op25/gr-op25_repeater/apps/gr_gnuplot.py @@ -27,7 +27,7 @@ import json import threading import glob -from gnuradio import gr, gru, eng_notation +from gnuradio import gr, eng_notation from gnuradio import blocks, audio from gnuradio.eng_option import eng_option import numpy as np diff --git a/op25/gr-op25_repeater/apps/multi_rx.py b/op25/gr-op25_repeater/apps/multi_rx.py index 0e00fe0..5674acc 100755 --- a/op25/gr-op25_repeater/apps/multi_rx.py +++ b/op25/gr-op25_repeater/apps/multi_rx.py @@ -28,7 +28,7 @@ import select import traceback import osmosdr -from gnuradio import audio, eng_notation, gr, gru, filter, blocks, fft, analog, digital +from gnuradio import audio, eng_notation, gr, filter, blocks, fft, analog, digital from gnuradio.eng_option import eng_option from math import pi from optparse import OptionParser diff --git a/op25/gr-op25_repeater/apps/p25_decoder.py b/op25/gr-op25_repeater/apps/p25_decoder.py index be60627..c15b94f 100644 --- a/op25/gr-op25_repeater/apps/p25_decoder.py +++ b/op25/gr-op25_repeater/apps/p25_decoder.py @@ -27,7 +27,7 @@ P25 decoding block. """ import time -from gnuradio import gr, gru, eng_notation +from gnuradio import gr, eng_notation from gnuradio import blocks, audio from gnuradio.eng_option import eng_option import op25 diff --git a/op25/gr-op25_repeater/apps/p25_demodulator.py b/op25/gr-op25_repeater/apps/p25_demodulator.py index 1baf901..b74e4aa 100644 --- a/op25/gr-op25_repeater/apps/p25_demodulator.py +++ b/op25/gr-op25_repeater/apps/p25_demodulator.py @@ -27,7 +27,7 @@ P25 C4FM/CQPSK demodulation block. """ import sys -from gnuradio import gr, gru, eng_notation +from gnuradio import gr, eng_notation from gnuradio import filter, analog, digital, blocks from gnuradio.eng_option import eng_option import op25 diff --git a/op25/gr-op25_repeater/apps/rx.py b/op25/gr-op25_repeater/apps/rx.py index 4468cf0..2d99125 100755 --- a/op25/gr-op25_repeater/apps/rx.py +++ b/op25/gr-op25_repeater/apps/rx.py @@ -44,7 +44,7 @@ try: except: pass -from gnuradio import audio, eng_notation, gr, gru, filter, blocks, fft, analog, digital +from gnuradio import audio, eng_notation, gr, filter, blocks, fft, analog, digital from gnuradio.eng_option import eng_option from math import pi from optparse import OptionParser diff --git a/op25/gr-op25_repeater/apps/tdma/tdma_audio.py b/op25/gr-op25_repeater/apps/tdma/tdma_audio.py index 391ed9f..ade6bb6 100755 --- a/op25/gr-op25_repeater/apps/tdma/tdma_audio.py +++ b/op25/gr-op25_repeater/apps/tdma/tdma_audio.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -from gnuradio import gr, gru, audio, eng_notation, analog, blocks, filter +from gnuradio import gr, audio, eng_notation, analog, blocks, filter from gnuradio.eng_option import eng_option from optparse import OptionParser import numpy as np diff --git a/op25/gr-op25_repeater/apps/tx/dv_tx.py b/op25/gr-op25_repeater/apps/tx/dv_tx.py index 342ba3f..b6e5516 100755 --- a/op25/gr-op25_repeater/apps/tx/dv_tx.py +++ b/op25/gr-op25_repeater/apps/tx/dv_tx.py @@ -25,7 +25,7 @@ import sys import os import math -from gnuradio import gr, gru, audio, eng_notation +from gnuradio import gr, audio, eng_notation from gnuradio import filter, blocks, analog, digital from gnuradio.eng_option import eng_option from optparse import OptionParser diff --git a/op25/gr-op25_repeater/apps/tx/multi_tx.py b/op25/gr-op25_repeater/apps/tx/multi_tx.py index a54bc01..a0eaf0b 100755 --- a/op25/gr-op25_repeater/apps/tx/multi_tx.py +++ b/op25/gr-op25_repeater/apps/tx/multi_tx.py @@ -31,7 +31,7 @@ import sys import os import math import json -from gnuradio import gr, gru, audio, eng_notation +from gnuradio import gr, audio, eng_notation from gnuradio import filter, blocks, analog, digital from gnuradio.eng_option import eng_option from optparse import OptionParser diff --git a/op25/gr-op25_repeater/apps/tx/op25_c4fm_mod.py b/op25/gr-op25_repeater/apps/tx/op25_c4fm_mod.py index 6d7c812..6962a5f 100755 --- a/op25/gr-op25_repeater/apps/tx/op25_c4fm_mod.py +++ b/op25/gr-op25_repeater/apps/tx/op25_c4fm_mod.py @@ -30,7 +30,7 @@ P25 C4FM pre-modulation block with additions for RRC (for dmr/ysf) and dstar gmsk """ -from gnuradio import gr, gru, eng_notation +from gnuradio import gr, eng_notation from gnuradio.digital import modulation_utils from gnuradio import filter, digital, blocks from gnuradio.eng_option import eng_option diff --git a/op25/gr-op25_repeater/apps/tx/unpack.py b/op25/gr-op25_repeater/apps/tx/unpack.py index 7cbf05b..5e0e84e 100755 --- a/op25/gr-op25_repeater/apps/tx/unpack.py +++ b/op25/gr-op25_repeater/apps/tx/unpack.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from gnuradio import gr, gru, audio, eng_notation, blocks +from gnuradio import gr, audio, eng_notation, blocks from gnuradio.eng_option import eng_option from optparse import OptionParser diff --git a/op25/gr-op25_repeater/apps/util/arb-resample.py b/op25/gr-op25_repeater/apps/util/arb-resample.py index 56a762f..7f99561 100755 --- a/op25/gr-op25_repeater/apps/util/arb-resample.py +++ b/op25/gr-op25_repeater/apps/util/arb-resample.py @@ -2,7 +2,7 @@ import sys import math -from gnuradio import gr, gru, audio, eng_notation, filter, blocks +from gnuradio import gr, audio, eng_notation, filter, blocks from gnuradio import analog, digital from gnuradio.eng_option import eng_option from optparse import OptionParser diff --git a/op25/gr-op25_repeater/apps/util/cqpsk-demod-file.py b/op25/gr-op25_repeater/apps/util/cqpsk-demod-file.py index 051ddf0..09d5f38 100755 --- a/op25/gr-op25_repeater/apps/util/cqpsk-demod-file.py +++ b/op25/gr-op25_repeater/apps/util/cqpsk-demod-file.py @@ -16,7 +16,7 @@ import sys import os import math -from gnuradio import gr, gru, audio, eng_notation +from gnuradio import gr, audio, eng_notation from gnuradio import filter, blocks, analog, digital from gnuradio.eng_option import eng_option from optparse import OptionParser