diff options
40 files changed, 151 insertions, 171 deletions
diff --git a/gr-blocks/python/blocks/CMakeLists.txt b/gr-blocks/python/blocks/CMakeLists.txt index 841588799b..312445e2b3 100644 --- a/gr-blocks/python/blocks/CMakeLists.txt +++ b/gr-blocks/python/blocks/CMakeLists.txt @@ -34,16 +34,17 @@ GR_PYTHON_INSTALL( ######################################################################## if(ENABLE_TESTING) -list(APPEND GR_TEST_PYTHON_DIRS - ${CMAKE_BINARY_DIR}/gr-blocks/python - ${CMAKE_BINARY_DIR}/gr-blocks/swig -) -list(APPEND GR_TEST_TARGET_DEPS gnuradio-blocks) + set(GR_TEST_TARGET_DEPS "") + set(GR_TEST_LIBRARY_DIRS "") + set(GR_TEST_PYTHON_DIRS + ${CMAKE_BINARY_DIR}/gruel/src/python + ${CMAKE_BINARY_DIR}/gnuradio-core/src/python + ) -include(GrTest) -file(GLOB py_qa_test_files "qa_*.py") -foreach(py_qa_test_file ${py_qa_test_files}) + include(GrTest) + file(GLOB py_qa_test_files "qa_*.py") + foreach(py_qa_test_file ${py_qa_test_files}) get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE) GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file}) -endforeach(py_qa_test_file) + endforeach(py_qa_test_file) endif(ENABLE_TESTING) diff --git a/gr-blocks/python/blocks/qa_add_mult_div_sub.py b/gr-blocks/python/blocks/qa_add_mult_div_sub.py index 0aca03d3fd..06bc9c3db5 100755 --- a/gr-blocks/python/blocks/qa_add_mult_div_sub.py +++ b/gr-blocks/python/blocks/qa_add_mult_div_sub.py @@ -20,8 +20,7 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import blocks_swig +from gnuradio import gr, gr_unittest, blocks class test_add_mult_div_sub(gr_unittest.TestCase): @@ -77,28 +76,28 @@ class test_add_mult_div_sub(gr_unittest.TestCase): src1_data = (1, 2, 3, 4, 5) src2_data = (8, -3, 4, 8, 2) expected_result = (9, -1, 7, 12, 7) - op = blocks_swig.add_ss() + op = blocks.add_ss() self.help_ss((src1_data, src2_data), expected_result, op) def test_add_ii(self): src1_data = (1, 2, 3, 4, 5) src2_data = (8, -3, 4, 8, 2) expected_result = (9, -1, 7, 12, 7) - op = blocks_swig.add_ii() + op = blocks.add_ii() self.help_ii((src1_data, src2_data), expected_result, op) def test_add_ff(self): src1_data = (1.0, 2.0, 3.0, 4.0, 5.0) src2_data = (8.0, -3.0, 4.0, 8.0, 2.0) expected_result = (9.0, -1.0, 7.0, 12.0, 7.0) - op = blocks_swig.add_ff() + op = blocks.add_ff() self.help_ff((src1_data, src2_data), expected_result, op) def test_add_cc(self): src1_data = (1+1j, 2+2j, 3+3j, 4+4j, 5+5j) src2_data = (8+8j, -3-3j, 4+4j, 8+8j, 2+2j) expected_result = (9+9j, -1-1j, 7+7j, 12+12j, 7+7j) - op = blocks_swig.add_cc() + op = blocks.add_cc() self.help_cc((src1_data, src2_data), expected_result, op) # add_const_XX @@ -106,25 +105,25 @@ class test_add_mult_div_sub(gr_unittest.TestCase): def test_add_const_ss(self): src_data = (1, 2, 3, 4, 5) expected_result = (6, 7, 8, 9, 10) - op = blocks_swig.add_const_ss(5) + op = blocks.add_const_ss(5) self.help_ss((src_data,), expected_result, op) def test_add_const_ii(self): src_data = (1, 2, 3, 4, 5) expected_result = (6, 7, 8, 9, 10) - op = blocks_swig.add_const_ii(5) + op = blocks.add_const_ii(5) self.help_ii((src_data,), expected_result, op) def test_add_const_ff(self): src_data = (1, 2, 3, 4, 5) expected_result = (6, 7, 8, 9, 10) - op = blocks_swig.add_const_ff(5) + op = blocks.add_const_ff(5) self.help_ff((src_data,), expected_result, op) def test_add_const_cc(self): src_data = (1, 2, 3, 4, 5) expected_result = (1+5j, 2+5j, 3+5j, 4+5j, 5+5j) - op = blocks_swig.add_const_cc(5j) + op = blocks.add_const_cc(5j) self.help_cc((src_data,), expected_result, op) # multiply_XX @@ -133,7 +132,7 @@ class test_add_mult_div_sub(gr_unittest.TestCase): src1_data = (1, 2, 3, 4, 5) src2_data = (8, -3, 4, 8, 2) expected_result = (8, -6, 12, 32, 10) - op = blocks_swig.multiply_ss() + op = blocks.multiply_ss() self.help_ss((src1_data, src2_data), expected_result, op) @@ -141,7 +140,7 @@ class test_add_mult_div_sub(gr_unittest.TestCase): src1_data = (1, 2, 3, 4, 5) src2_data = (8, -3, 4, 8, 2) expected_result = (8, -6, 12, 32, 10) - op = blocks_swig.multiply_ii() + op = blocks.multiply_ii() self.help_ii((src1_data, src2_data), expected_result, op) @@ -149,7 +148,7 @@ class test_add_mult_div_sub(gr_unittest.TestCase): src1_data = (1, 2, 3, 4, 5) src2_data = (8, -3, 4, 8, 2) expected_result = (8, -6, 12, 32, 10) - op = blocks_swig.multiply_ff() + op = blocks.multiply_ff() self.help_ff((src1_data, src2_data), expected_result, op) @@ -157,7 +156,7 @@ class test_add_mult_div_sub(gr_unittest.TestCase): src1_data = (1+1j, 2+2j, 3+3j, 4+4j, 5+5j) src2_data = (8, -3, 4, 8, 2) expected_result = (8+8j, -6-6j, 12+12j, 32+32j, 10+10j) - op = blocks_swig.multiply_cc() + op = blocks.multiply_cc() self.help_cc((src1_data, src2_data), expected_result, op) @@ -166,38 +165,38 @@ class test_add_mult_div_sub(gr_unittest.TestCase): def test_multiply_const_ss(self): src_data = (-1, 0, 1, 2, 3) expected_result = (-5, 0, 5, 10, 15) - op = blocks_swig.multiply_const_ss(5) + op = blocks.multiply_const_ss(5) self.help_ss((src_data,), expected_result, op) def test_multiply_const_ii(self): src_data = (-1, 0, 1, 2, 3) expected_result = (-5, 0, 5, 10, 15) - op = blocks_swig.multiply_const_ii(5) + op = blocks.multiply_const_ii(5) self.help_ii((src_data,), expected_result, op) def test_multiply_const_ff(self): src_data = (-1, 0, 1, 2, 3) expected_result = (-5, 0, 5, 10, 15) - op = blocks_swig.multiply_const_ff(5) + op = blocks.multiply_const_ff(5) self.help_ff((src_data,), expected_result, op) def test_multiply_const_cc(self): src_data = (-1-1j, 0+0j, 1+1j, 2+2j, 3+3j) expected_result = (-5-5j, 0+0j, 5+5j, 10+10j, 15+15j) - op = blocks_swig.multiply_const_cc(5) + op = blocks.multiply_const_cc(5) self.help_cc((src_data,), expected_result, op) def test_multiply_const_cc2(self): src_data = (-1-1j, 0+0j, 1+1j, 2+2j, 3+3j) expected_result = (-3-7j, 0+0j, 3+7j, 6+14j, 9+21j) - op = blocks_swig.multiply_const_cc(5+2j) + op = blocks.multiply_const_cc(5+2j) self.help_cc((src_data,), expected_result, op) def test_sub_ii(self): src1_data = (1, 2, 3, 4, 5) src2_data = (8, -3, 4, 8, 2) expected_result = (-7, 5, -1, -4, 3) - op = blocks_swig.sub_ii() + op = blocks.sub_ii() self.help_ii((src1_data, src2_data), expected_result, op) @@ -205,7 +204,7 @@ class test_add_mult_div_sub(gr_unittest.TestCase): src1_data = ( 5, 9, -15, 1024) src2_data = (10, 3, -5, 64) expected_result = (0.5, 3, 3, 16) - op = blocks_swig.divide_ff() + op = blocks.divide_ff() self.help_ff((src1_data, src2_data), expected_result, op) if __name__ == '__main__': diff --git a/gr-blocks/python/blocks/qa_add_mult_v.py b/gr-blocks/python/blocks/qa_add_mult_v.py index 13cb71df2c..2c79aace6d 100755 --- a/gr-blocks/python/blocks/qa_add_mult_v.py +++ b/gr-blocks/python/blocks/qa_add_mult_v.py @@ -20,8 +20,7 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import blocks_swig as blocks +from gnuradio import gr, gr_unittest, blocks class test_add_mult_v(gr_unittest.TestCase): diff --git a/gr-blocks/python/blocks/qa_argmax.py b/gr-blocks/python/blocks/qa_argmax.py index ec82b71cd4..3b394c6e62 100644 --- a/gr-blocks/python/blocks/qa_argmax.py +++ b/gr-blocks/python/blocks/qa_argmax.py @@ -20,8 +20,8 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import blocks_swig as blocks +from gnuradio import gr, gr_unittest, blocks + import math class test_arg_max(gr_unittest.TestCase): diff --git a/gr-blocks/python/blocks/qa_bin_statistics.py b/gr-blocks/python/blocks/qa_bin_statistics.py index 666f7c0d68..3be3eef681 100755 --- a/gr-blocks/python/blocks/qa_bin_statistics.py +++ b/gr-blocks/python/blocks/qa_bin_statistics.py @@ -20,8 +20,8 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import blocks_swig as blocks +from gnuradio import gr, gr_unittest, blocks + import random import struct diff --git a/gr-blocks/python/blocks/qa_boolean_operators.py b/gr-blocks/python/blocks/qa_boolean_operators.py index 5572f60acb..9ef6ef6118 100755 --- a/gr-blocks/python/blocks/qa_boolean_operators.py +++ b/gr-blocks/python/blocks/qa_boolean_operators.py @@ -20,8 +20,7 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import blocks_swig +from gnuradio import gr, gr_unittest, blocks class test_boolean_operators (gr_unittest.TestCase): @@ -65,7 +64,7 @@ class test_boolean_operators (gr_unittest.TestCase): src1_data = (1, 2, 3, 0x5004, 0x1150) src2_data = (8, 2, 1 , 0x0508, 0x1105) expected_result = (9, 0, 2, 0x550C, 0x0055) - op = blocks_swig.xor_ss () + op = blocks.xor_ss () self.help_ss ((src1_data, src2_data), expected_result, op) @@ -73,7 +72,7 @@ class test_boolean_operators (gr_unittest.TestCase): src1_data = (1, 2, 3, 4, 0x50) src2_data = (8, 2, 1 , 8, 0x05) expected_result = (9, 0, 2, 0xC, 0x55) - op = blocks_swig.xor_bb () + op = blocks.xor_bb () self.help_bb ((src1_data, src2_data), expected_result, op) @@ -82,7 +81,7 @@ class test_boolean_operators (gr_unittest.TestCase): src1_data = (1, 2, 3, 0x5000004, 0x11000050) src2_data = (8, 2, 1 , 0x0500008, 0x11000005) expected_result = (9, 0, 2, 0x550000C, 0x00000055) - op = blocks_swig.xor_ii () + op = blocks.xor_ii () self.help_ii ((src1_data, src2_data), expected_result, op) @@ -91,7 +90,7 @@ class test_boolean_operators (gr_unittest.TestCase): src1_data = (1, 2, 3, 0x5004, 0x1150) src2_data = (8, 2, 1 , 0x0508, 0x1105) expected_result = (0, 2, 1, 0x0000, 0x1100) - op = blocks_swig.and_ss () + op = blocks.and_ss () self.help_ss ((src1_data, src2_data), expected_result, op) @@ -100,7 +99,7 @@ class test_boolean_operators (gr_unittest.TestCase): src2_data = (8, 2, 2, 1, 0x08, 0x05) src3_data = (8, 2, 1, 1, 0x08, 0x05) expected_result = (0, 2, 0, 1, 0x00, 0x00) - op = blocks_swig.and_bb () + op = blocks.and_bb () self.help_bb ((src1_data, src2_data, src3_data), expected_result, op) @@ -108,7 +107,7 @@ class test_boolean_operators (gr_unittest.TestCase): src1_data = (1, 2, 3, 0x50005004, 0x11001150) src2_data = (8, 2, 1 , 0x05000508, 0x11001105) expected_result = (0, 2, 1, 0x00000000, 0x11001100) - op = blocks_swig.and_ii () + op = blocks.and_ii () self.help_ii ((src1_data, src2_data), expected_result, op) @@ -116,7 +115,7 @@ class test_boolean_operators (gr_unittest.TestCase): src_data = (1, 2, 3, 0x5004, 0x1150) expected_result = (0, 2, 2, 0x5000, 0x1100) src = gr.vector_source_s(src_data) - op = blocks_swig.and_const_ss (0x55AA) + op = blocks.and_const_ss (0x55AA) dst = gr.vector_sink_s() self.tb.connect(src, op, dst) self.tb.run() @@ -126,7 +125,7 @@ class test_boolean_operators (gr_unittest.TestCase): src_data = (1, 2, 3, 0x50, 0x11) expected_result = (0, 2, 2, 0x00, 0x00) src = gr.vector_source_b(src_data) - op = blocks_swig.and_const_bb (0xAA) + op = blocks.and_const_bb (0xAA) dst = gr.vector_sink_b() self.tb.connect(src, op, dst) self.tb.run() @@ -137,7 +136,7 @@ class test_boolean_operators (gr_unittest.TestCase): src_data = (1, 2, 3, 0x5004, 0x1150) expected_result = (0, 2, 2, 0x5000, 0x1100) src = gr.vector_source_i(src_data) - op = blocks_swig.and_const_ii (0x55AA) + op = blocks.and_const_ii (0x55AA) dst = gr.vector_sink_i() self.tb.connect(src, op, dst) self.tb.run() @@ -148,7 +147,7 @@ class test_boolean_operators (gr_unittest.TestCase): src1_data = (1, 2, 3, 0x5004, 0x1150) src2_data = (8, 2, 1 , 0x0508, 0x1105) expected_result = (9, 2, 3, 0x550C, 0x1155) - op = blocks_swig.or_ss () + op = blocks.or_ss () self.help_ss ((src1_data, src2_data), expected_result, op) @@ -157,7 +156,7 @@ class test_boolean_operators (gr_unittest.TestCase): src2_data = (8, 2, 2, 1 , 0x08, 0x05) src3_data = (8, 2, 1, 1 , 0x08, 0x05) expected_result = (9, 2, 3, 3, 0x0C, 0x55) - op = blocks_swig.or_bb () + op = blocks.or_bb () self.help_bb ((src1_data, src2_data, src3_data), expected_result, op) @@ -165,28 +164,28 @@ class test_boolean_operators (gr_unittest.TestCase): src1_data = (1, 2, 3, 0x50005004, 0x11001150) src2_data = (8, 2, 1 , 0x05000508, 0x11001105) expected_result = (9, 2, 3, 0x5500550C, 0x11001155) - op = blocks_swig.or_ii () + op = blocks.or_ii () self.help_ii ((src1_data, src2_data), expected_result, op) def test_not_ss (self): src1_data = (1, 2, 3, 0x5004, 0x1150) expected_result = (~1, ~2, ~3, ~0x5004, ~0x1150) - op = blocks_swig.not_ss () + op = blocks.not_ss () self.help_ss ((((src1_data),)), expected_result, op) def test_not_bb (self): src1_data = (1, 2, 2, 3, 0x04, 0x50) expected_result = (0xFE, 0xFD, 0xFD, 0xFC, 0xFB, 0xAF) - op = blocks_swig.not_bb () + op = blocks.not_bb () self.help_bb (((src1_data), ), expected_result, op) def test_not_ii (self): src1_data = (1, 2, 3, 0x50005004, 0x11001150) expected_result = (~1 , ~2, ~3, ~0x50005004, ~0x11001150) - op = blocks_swig.not_ii () + op = blocks.not_ii () self.help_ii (((src1_data),), expected_result, op) diff --git a/gr-blocks/python/blocks/qa_burst_tagger.py b/gr-blocks/python/blocks/qa_burst_tagger.py index dfe9ec6429..912a46b80d 100644 --- a/gr-blocks/python/blocks/qa_burst_tagger.py +++ b/gr-blocks/python/blocks/qa_burst_tagger.py @@ -20,8 +20,8 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import blocks_swig as blocks +from gnuradio import gr, gr_unittest, blocks + import pmt class test_burst_tagger(gr_unittest.TestCase): diff --git a/gr-blocks/python/blocks/qa_conjugate.py b/gr-blocks/python/blocks/qa_conjugate.py index 1808aa9c0b..e8c409995c 100644 --- a/gr-blocks/python/blocks/qa_conjugate.py +++ b/gr-blocks/python/blocks/qa_conjugate.py @@ -20,8 +20,7 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import blocks_swig +from gnuradio import gr, gr_unittest, blocks class test_conjugate (gr_unittest.TestCase): @@ -41,7 +40,7 @@ class test_conjugate (gr_unittest.TestCase): 0-0j) src = gr.vector_source_c(src_data) - op = blocks_swig.conjugate_cc () + op = blocks.conjugate_cc () dst = gr.vector_sink_c () self.tb.connect(src, op) diff --git a/gr-blocks/python/blocks/qa_delay.py b/gr-blocks/python/blocks/qa_delay.py index 031cadb2d7..38a03475ae 100755 --- a/gr-blocks/python/blocks/qa_delay.py +++ b/gr-blocks/python/blocks/qa_delay.py @@ -20,8 +20,7 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import blocks_swig as blocks +from gnuradio import gr, gr_unittest, blocks class test_delay(gr_unittest.TestCase): diff --git a/gr-blocks/python/blocks/qa_file_metadata.py b/gr-blocks/python/blocks/qa_file_metadata.py index cf7a075f42..7afd6a70f5 100644 --- a/gr-blocks/python/blocks/qa_file_metadata.py +++ b/gr-blocks/python/blocks/qa_file_metadata.py @@ -20,12 +20,13 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import parse_file_metadata -import blocks_swig as blocks -import pmt import os, math +from gnuradio import gr, gr_unittest, blocks +import pmt + +import parse_file_metadata + def sig_source_c(samp_rate, freq, amp, N): t = map(lambda x: float(x)/samp_rate, xrange(N)) y = map(lambda x: amp*math.cos(2.*math.pi*freq*x) + \ diff --git a/gr-blocks/python/blocks/qa_integrate.py b/gr-blocks/python/blocks/qa_integrate.py index c404f1b309..c01adc60c2 100755 --- a/gr-blocks/python/blocks/qa_integrate.py +++ b/gr-blocks/python/blocks/qa_integrate.py @@ -20,8 +20,8 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import blocks_swig +from gnuradio import gr, gr_unittest, blocks + import math class test_integrate (gr_unittest.TestCase): @@ -36,7 +36,7 @@ class test_integrate (gr_unittest.TestCase): src_data = (1, 2, 3, 4, 5, 6) dst_data = (6, 15) src = gr.vector_source_s(src_data) - itg = blocks_swig.integrate_ss(3) + itg = blocks.integrate_ss(3) dst = gr.vector_sink_s() self.tb.connect(src, itg, dst) self.tb.run() @@ -46,7 +46,7 @@ class test_integrate (gr_unittest.TestCase): src_data = (1, 2, 3, 4, 5, 6) dst_data = (6, 15) src = gr.vector_source_i(src_data) - itg = blocks_swig.integrate_ii(3) + itg = blocks.integrate_ii(3) dst = gr.vector_sink_i() self.tb.connect(src, itg, dst) self.tb.run() @@ -56,7 +56,7 @@ class test_integrate (gr_unittest.TestCase): src_data = [1.0, 2.0, 3.0, 4.0, 5.0, 6.0] dst_data = [6.0, 15.0] src = gr.vector_source_f(src_data) - itg = blocks_swig.integrate_ff(3) + itg = blocks.integrate_ff(3) dst = gr.vector_sink_f() self.tb.connect(src, itg, dst) self.tb.run() @@ -66,7 +66,7 @@ class test_integrate (gr_unittest.TestCase): src_data = [1.0+1.0j, 2.0+2.0j, 3.0+3.0j, 4.0+4.0j, 5.0+5.0j, 6.0+6.0j] dst_data = [6.0+6.0j, 15.0+15.0j] src = gr.vector_source_c(src_data) - itg = blocks_swig.integrate_cc(3) + itg = blocks.integrate_cc(3) dst = gr.vector_sink_c() self.tb.connect(src, itg, dst) self.tb.run() diff --git a/gr-blocks/python/blocks/qa_interleave.py b/gr-blocks/python/blocks/qa_interleave.py index 376d487b10..3fcfb230cc 100755 --- a/gr-blocks/python/blocks/qa_interleave.py +++ b/gr-blocks/python/blocks/qa_interleave.py @@ -20,8 +20,8 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import blocks_swig +from gnuradio import gr, gr_unittest, blocks + import math class test_interleave (gr_unittest.TestCase): @@ -38,7 +38,7 @@ class test_interleave (gr_unittest.TestCase): src1 = gr.vector_source_f (range (1, lenx, 4)) src2 = gr.vector_source_f (range (2, lenx, 4)) src3 = gr.vector_source_f (range (3, lenx, 4)) - op = blocks_swig.interleave (gr.sizeof_float) + op = blocks.interleave (gr.sizeof_float) dst = gr.vector_sink_f () self.tb.connect (src0, (op, 0)) @@ -54,7 +54,7 @@ class test_interleave (gr_unittest.TestCase): def test_deint_001 (self): lenx = 64 src = gr.vector_source_f (range (lenx)) - op = blocks_swig.deinterleave (gr.sizeof_float) + op = blocks.deinterleave (gr.sizeof_float) dst0 = gr.vector_sink_f () dst1 = gr.vector_sink_f () dst2 = gr.vector_sink_f () diff --git a/gr-blocks/python/blocks/qa_keep_m_in_n.py b/gr-blocks/python/blocks/qa_keep_m_in_n.py index 0898217ba9..19730fb656 100755 --- a/gr-blocks/python/blocks/qa_keep_m_in_n.py +++ b/gr-blocks/python/blocks/qa_keep_m_in_n.py @@ -19,8 +19,8 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -from gnuradio import gr, gr_unittest -import blocks_swig +from gnuradio import gr, gr_unittest, blocks + import sys import random @@ -38,9 +38,9 @@ class test_keep_m_in_n(gr_unittest.TestCase): src = gr.vector_source_b( range(0,100) ) # itemsize, M, N, offset - km2 = blocks_swig.keep_m_in_n( 1, 1, 2, 0 ); - km3 = blocks_swig.keep_m_in_n( 1, 1, 3, 1 ); - km7 = blocks_swig.keep_m_in_n( 1, 1, 7, 2 ); + km2 = blocks.keep_m_in_n( 1, 1, 2, 0 ); + km3 = blocks.keep_m_in_n( 1, 1, 3, 1 ); + km7 = blocks.keep_m_in_n( 1, 1, 7, 2 ); snk2 = gr.vector_sink_b(); snk3 = gr.vector_sink_b(); snk7 = gr.vector_sink_b(); diff --git a/gr-blocks/python/blocks/qa_keep_one_in_n.py b/gr-blocks/python/blocks/qa_keep_one_in_n.py index 8c5f44b84b..8a13df71f7 100755 --- a/gr-blocks/python/blocks/qa_keep_one_in_n.py +++ b/gr-blocks/python/blocks/qa_keep_one_in_n.py @@ -20,8 +20,7 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import blocks_swig +from gnuradio import gr, gr_unittest, blocks class test_keep_one_in_n(gr_unittest.TestCase): @@ -35,7 +34,7 @@ class test_keep_one_in_n(gr_unittest.TestCase): src_data = (1, 2, 3, 4, 5, 6, 7, 8, 9, 10) expected_data = (5, 10) src = gr.vector_source_b(src_data); - op = blocks_swig.keep_one_in_n(gr.sizeof_char, 5) + op = blocks.keep_one_in_n(gr.sizeof_char, 5) dst = gr.vector_sink_b() self.tb.connect(src, op, dst) self.tb.run() diff --git a/gr-blocks/python/blocks/qa_max.py b/gr-blocks/python/blocks/qa_max.py index 4af70bd4be..6cd42269eb 100755 --- a/gr-blocks/python/blocks/qa_max.py +++ b/gr-blocks/python/blocks/qa_max.py @@ -20,8 +20,8 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import blocks_swig as blocks +from gnuradio import gr, gr_unittest, blocks + import math class test_max(gr_unittest.TestCase): diff --git a/gr-blocks/python/blocks/qa_message.py b/gr-blocks/python/blocks/qa_message.py index a556f65cee..75e9f3f778 100755 --- a/gr-blocks/python/blocks/qa_message.py +++ b/gr-blocks/python/blocks/qa_message.py @@ -20,11 +20,11 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import blocks_swig as blocks -import pmt import time +from gnuradio import gr, gr_unittest, blocks +import pmt + def all_counts(): return (gr.block_ncurrently_allocated(), gr.block_detail_ncurrently_allocated(), diff --git a/gr-blocks/python/blocks/qa_moving_average.py b/gr-blocks/python/blocks/qa_moving_average.py index 169b4746c2..2262011623 100644 --- a/gr-blocks/python/blocks/qa_moving_average.py +++ b/gr-blocks/python/blocks/qa_moving_average.py @@ -20,8 +20,8 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import blocks_swig as blocks +from gnuradio import gr, gr_unittest, blocks + import math, random def make_random_complex_tuple(L, scale=1): diff --git a/gr-blocks/python/blocks/qa_multiply_conjugate.py b/gr-blocks/python/blocks/qa_multiply_conjugate.py index f51563f854..a78e4ebd04 100644 --- a/gr-blocks/python/blocks/qa_multiply_conjugate.py +++ b/gr-blocks/python/blocks/qa_multiply_conjugate.py @@ -20,8 +20,7 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import blocks_swig +from gnuradio import gr, gr_unittest, blocks class test_multiply_conjugate (gr_unittest.TestCase): @@ -44,7 +43,7 @@ class test_multiply_conjugate (gr_unittest.TestCase): 0+0j) src0 = gr.vector_source_c(src_data0) src1 = gr.vector_source_c(src_data1) - op = blocks_swig.multiply_conjugate_cc () + op = blocks.multiply_conjugate_cc () dst = gr.vector_sink_c () self.tb.connect(src0, (op,0)) diff --git a/gr-blocks/python/blocks/qa_mute.py b/gr-blocks/python/blocks/qa_mute.py index 96c57b2ed1..c4228b980c 100755 --- a/gr-blocks/python/blocks/qa_mute.py +++ b/gr-blocks/python/blocks/qa_mute.py @@ -20,8 +20,7 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import blocks_swig as blocks +from gnuradio import gr, gr_unittest, blocks class test_mute(gr_unittest.TestCase): diff --git a/gr-blocks/python/blocks/qa_nlog10.py b/gr-blocks/python/blocks/qa_nlog10.py index cc2a3e8cc5..9e6294cf5f 100755 --- a/gr-blocks/python/blocks/qa_nlog10.py +++ b/gr-blocks/python/blocks/qa_nlog10.py @@ -20,8 +20,7 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import blocks_swig +from gnuradio import gr, gr_unittest, blocks class test_nlog10(gr_unittest.TestCase): @@ -35,7 +34,7 @@ class test_nlog10(gr_unittest.TestCase): src_data = (-10, 0, 10, 100, 1000, 10000, 100000) expected_result = (-180, -180, 10, 20, 30, 40, 50) src = gr.vector_source_f(src_data) - op = blocks_swig.nlog10_ff(10) + op = blocks.nlog10_ff(10) dst = gr.vector_sink_f() self.tb.connect (src, op, dst) self.tb.run() diff --git a/gr-blocks/python/blocks/qa_pack_k_bits.py b/gr-blocks/python/blocks/qa_pack_k_bits.py index cd55d2f200..992b5e1b78 100755 --- a/gr-blocks/python/blocks/qa_pack_k_bits.py +++ b/gr-blocks/python/blocks/qa_pack_k_bits.py @@ -20,10 +20,10 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import blocks_swig as blocks import random +from gnuradio import gr, gr_unittest, blocks + class test_pack(gr_unittest.TestCase): def setUp(self): diff --git a/gr-blocks/python/blocks/qa_packed_to_unpacked.py b/gr-blocks/python/blocks/qa_packed_to_unpacked.py index d84f5dbd37..4eb6e5251b 100755 --- a/gr-blocks/python/blocks/qa_packed_to_unpacked.py +++ b/gr-blocks/python/blocks/qa_packed_to_unpacked.py @@ -20,8 +20,8 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import blocks_swig as blocks +from gnuradio import gr, gr_unittest, blocks + import random class test_packing(gr_unittest.TestCase): diff --git a/gr-blocks/python/blocks/qa_patterned_interleaver.py b/gr-blocks/python/blocks/qa_patterned_interleaver.py index 3cf29c9178..005ac0f916 100755 --- a/gr-blocks/python/blocks/qa_patterned_interleaver.py +++ b/gr-blocks/python/blocks/qa_patterned_interleaver.py @@ -20,11 +20,8 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -try: - import blocks_swig as blocks -except: - from gnuradio import blocks +from gnuradio import gr, gr_unittest, blocks + import math class test_patterned_interleaver (gr_unittest.TestCase): diff --git a/gr-blocks/python/blocks/qa_pdu.py b/gr-blocks/python/blocks/qa_pdu.py index c8fc0e5a91..0c396b71c7 100755 --- a/gr-blocks/python/blocks/qa_pdu.py +++ b/gr-blocks/python/blocks/qa_pdu.py @@ -20,11 +20,11 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import blocks_swig as blocks -import pmt import time +from gnuradio import gr, gr_unittest, blocks +import pmt + class test_pdu(gr_unittest.TestCase): def setUp(self): diff --git a/gr-blocks/python/blocks/qa_peak_detector.py b/gr-blocks/python/blocks/qa_peak_detector.py index c3ff2548c4..9b0eb01592 100644 --- a/gr-blocks/python/blocks/qa_peak_detector.py +++ b/gr-blocks/python/blocks/qa_peak_detector.py @@ -20,8 +20,7 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import blocks_swig as blocks +from gnuradio import gr, gr_unittest, blocks class test_peak_detector(gr_unittest.TestCase): diff --git a/gr-blocks/python/blocks/qa_peak_detector2.py b/gr-blocks/python/blocks/qa_peak_detector2.py index b2d8e318dd..2f2d983993 100644 --- a/gr-blocks/python/blocks/qa_peak_detector2.py +++ b/gr-blocks/python/blocks/qa_peak_detector2.py @@ -20,8 +20,7 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import blocks_swig as blocks +from gnuradio import gr, gr_unittest, blocks class test_peak_detector2(gr_unittest.TestCase): diff --git a/gr-blocks/python/blocks/qa_pipe_fittings.py b/gr-blocks/python/blocks/qa_pipe_fittings.py index 9894a5c211..d69aee485b 100755 --- a/gr-blocks/python/blocks/qa_pipe_fittings.py +++ b/gr-blocks/python/blocks/qa_pipe_fittings.py @@ -20,8 +20,7 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import blocks_swig as blocks +from gnuradio import gr, gr_unittest, blocks def calc_expected_result(src_data, n): assert (len(src_data) % n) == 0 diff --git a/gr-blocks/python/blocks/qa_probe_signal.py b/gr-blocks/python/blocks/qa_probe_signal.py index 6d25a25087..e04f29f413 100644 --- a/gr-blocks/python/blocks/qa_probe_signal.py +++ b/gr-blocks/python/blocks/qa_probe_signal.py @@ -20,8 +20,7 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import blocks_swig as blocks +from gnuradio import gr, gr_unittest, blocks class test_probe_signal(gr_unittest.TestCase): diff --git a/gr-blocks/python/blocks/qa_regenerate.py b/gr-blocks/python/blocks/qa_regenerate.py index a57eeba2bb..2e20aab81d 100755 --- a/gr-blocks/python/blocks/qa_regenerate.py +++ b/gr-blocks/python/blocks/qa_regenerate.py @@ -20,8 +20,7 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import blocks_swig as blocks +from gnuradio import gr, gr_unittest, blocks class test_regenerate(gr_unittest.TestCase): diff --git a/gr-blocks/python/blocks/qa_repeat.py b/gr-blocks/python/blocks/qa_repeat.py index 69fb3ef72d..2a381a5590 100755 --- a/gr-blocks/python/blocks/qa_repeat.py +++ b/gr-blocks/python/blocks/qa_repeat.py @@ -20,8 +20,8 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import blocks_swig +from gnuradio import gr, gr_unittest, blocks + import math class test_repeat (gr_unittest.TestCase): @@ -39,7 +39,7 @@ class test_repeat (gr_unittest.TestCase): dst_data += [1.0*n, 1.0*n, 1.0*n] src = gr.vector_source_f(src_data) - rpt = blocks_swig.repeat(gr.sizeof_float, 3) + rpt = blocks.repeat(gr.sizeof_float, 3) dst = gr.vector_sink_f() self.tb.connect(src, rpt, dst) self.tb.run() diff --git a/gr-blocks/python/blocks/qa_rms.py b/gr-blocks/python/blocks/qa_rms.py index f3386668af..ee3b7607e7 100644 --- a/gr-blocks/python/blocks/qa_rms.py +++ b/gr-blocks/python/blocks/qa_rms.py @@ -20,8 +20,8 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import blocks_swig as blocks +from gnuradio import gr, gr_unittest, blocks + import math def sig_source_f(samp_rate, freq, amp, N): diff --git a/gr-blocks/python/blocks/qa_sample_and_hold.py b/gr-blocks/python/blocks/qa_sample_and_hold.py index 59628090d1..4c738f0dce 100644 --- a/gr-blocks/python/blocks/qa_sample_and_hold.py +++ b/gr-blocks/python/blocks/qa_sample_and_hold.py @@ -21,8 +21,7 @@ # import time -from gnuradio import gr, gr_unittest -import blocks_swig as blocks +from gnuradio import gr, gr_unittest, blocks class test_sample_and_hold(gr_unittest.TestCase): diff --git a/gr-blocks/python/blocks/qa_stream_mux.py b/gr-blocks/python/blocks/qa_stream_mux.py index 657bd3d63f..fe28c2de9a 100755 --- a/gr-blocks/python/blocks/qa_stream_mux.py +++ b/gr-blocks/python/blocks/qa_stream_mux.py @@ -20,8 +20,8 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import blocks_swig +from gnuradio import gr, gr_unittest, blocks + import os class test_stream_mux (gr_unittest.TestCase): @@ -37,7 +37,7 @@ class test_stream_mux (gr_unittest.TestCase): v0 = gr.vector_source_f(N*[1,], False) v1 = gr.vector_source_f(N*[2,], False) - mux = blocks_swig.stream_mux(gr.sizeof_float, stream_sizes) + mux = blocks.stream_mux(gr.sizeof_float, stream_sizes) dst = gr.vector_sink_f () @@ -56,7 +56,7 @@ class test_stream_mux (gr_unittest.TestCase): v0 = gr.vector_source_f(r1, False) v1 = gr.vector_source_f(r2, False) - mux = blocks_swig.stream_mux(gr.sizeof_float, stream_sizes) + mux = blocks.stream_mux(gr.sizeof_float, stream_sizes) dst = gr.vector_sink_f () diff --git a/gr-blocks/python/blocks/qa_stretch.py b/gr-blocks/python/blocks/qa_stretch.py index 078b404dbf..be95914f33 100755 --- a/gr-blocks/python/blocks/qa_stretch.py +++ b/gr-blocks/python/blocks/qa_stretch.py @@ -20,8 +20,7 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import blocks_swig as blocks +from gnuradio import gr, gr_unittest, blocks class test_stretch(gr_unittest.TestCase): diff --git a/gr-blocks/python/blocks/qa_tag_debug.py b/gr-blocks/python/blocks/qa_tag_debug.py index ad85daebcc..a21c668bf1 100755 --- a/gr-blocks/python/blocks/qa_tag_debug.py +++ b/gr-blocks/python/blocks/qa_tag_debug.py @@ -20,8 +20,7 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import blocks_swig as blocks +from gnuradio import gr, gr_unittest, blocks class test_tag_debug(gr_unittest.TestCase): diff --git a/gr-blocks/python/blocks/qa_threshold.py b/gr-blocks/python/blocks/qa_threshold.py index f91af739ad..d2db145926 100644 --- a/gr-blocks/python/blocks/qa_threshold.py +++ b/gr-blocks/python/blocks/qa_threshold.py @@ -20,8 +20,7 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import blocks_swig as blocks +from gnuradio import gr, gr_unittest, blocks class test_threshold(gr_unittest.TestCase): diff --git a/gr-blocks/python/blocks/qa_throttle.py b/gr-blocks/python/blocks/qa_throttle.py index 5d462f2c9f..7d18e87ade 100755 --- a/gr-blocks/python/blocks/qa_throttle.py +++ b/gr-blocks/python/blocks/qa_throttle.py @@ -20,8 +20,7 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import blocks_swig as blocks +from gnuradio import gr, gr_unittest, blocks class test_throttle(gr_unittest.TestCase): diff --git a/gr-blocks/python/blocks/qa_transcendental.py b/gr-blocks/python/blocks/qa_transcendental.py index 8174f79630..cc88c61123 100644 --- a/gr-blocks/python/blocks/qa_transcendental.py +++ b/gr-blocks/python/blocks/qa_transcendental.py @@ -20,8 +20,8 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import blocks_swig as blocks +from gnuradio import gr, gr_unittest, blocks + import math class test_transcendental(gr_unittest.TestCase): diff --git a/gr-blocks/python/blocks/qa_type_conversions.py b/gr-blocks/python/blocks/qa_type_conversions.py index eb1b42b636..4eb3299255 100755 --- a/gr-blocks/python/blocks/qa_type_conversions.py +++ b/gr-blocks/python/blocks/qa_type_conversions.py @@ -20,8 +20,8 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import blocks_swig +from gnuradio import gr, gr_unittest, blocks + from math import sqrt, atan2 class test_type_conversions(gr_unittest.TestCase): @@ -36,7 +36,7 @@ class test_type_conversions(gr_unittest.TestCase): src_data = (1, 2, 3, 4, 5) expected_data = (1.0, 2.0, 3.0, 4.0, 5.0) src = gr.vector_source_b(src_data) - op = blocks_swig.char_to_float() + op = blocks.char_to_float() dst = gr.vector_sink_f() self.tb.connect(src, op, dst) self.tb.run() @@ -46,7 +46,7 @@ class test_type_conversions(gr_unittest.TestCase): src_data = (1, 2, 3, 4, 5) expected_data = (0.5, 1.0, 1.5, 2.0, 2.5) src = gr.vector_source_b(src_data) - op = blocks_swig.char_to_float(scale=2.0) + op = blocks.char_to_float(scale=2.0) dst = gr.vector_sink_f() self.tb.connect(src, op, dst) self.tb.run() @@ -56,7 +56,7 @@ class test_type_conversions(gr_unittest.TestCase): src_data = (1, 2, 3, 4, 5) expected_data = (256, 512, 768, 1024, 1280) src = gr.vector_source_b(src_data) - op = blocks_swig.char_to_short() + op = blocks.char_to_short() dst = gr.vector_sink_s() self.tb.connect(src, op, dst) self.tb.run() @@ -66,7 +66,7 @@ class test_type_conversions(gr_unittest.TestCase): src_data = (1+2j, 3+4j, 5+6j, 7+8j, 9+10j) expected_data = (1, 2, 3, 4, 5, 6, 7, 8, 9, 10) src = gr.vector_source_c(src_data) - op = blocks_swig.complex_to_interleaved_short() + op = blocks.complex_to_interleaved_short() dst = gr.vector_sink_s() self.tb.connect(src, op, dst) self.tb.run() @@ -76,7 +76,7 @@ class test_type_conversions(gr_unittest.TestCase): src_data = (1+2j, 3+4j, 5+6j, 7+8j, 9+10j) expected_data = (1.0, 3.0, 5.0, 7.0, 9.0) src = gr.vector_source_c(src_data) - op = blocks_swig.complex_to_float() + op = blocks.complex_to_float() dst = gr.vector_sink_f() self.tb.connect(src, op, dst) self.tb.run() @@ -87,7 +87,7 @@ class test_type_conversions(gr_unittest.TestCase): expected_data1 = (1.0, 3.0, 5.0, 7.0, 9.0) expected_data2 = (2.0, 4.0, 6.0, 8.0, 10.0) src = gr.vector_source_c(src_data) - op = blocks_swig.complex_to_float() + op = blocks.complex_to_float() dst1 = gr.vector_sink_f() dst2 = gr.vector_sink_f() self.tb.connect(src, op) @@ -101,7 +101,7 @@ class test_type_conversions(gr_unittest.TestCase): src_data = (1+2j, 3+4j, 5+6j, 7+8j, 9+10j) expected_data = (1.0, 3.0, 5.0, 7.0, 9.0) src = gr.vector_source_c(src_data) - op = blocks_swig.complex_to_real() + op = blocks.complex_to_real() dst = gr.vector_sink_f() self.tb.connect(src, op, dst) self.tb.run() @@ -111,7 +111,7 @@ class test_type_conversions(gr_unittest.TestCase): src_data = (1+2j, 3+4j, 5+6j, 7+8j, 9+10j) expected_data = (2.0, 4.0, 6.0, 8.0, 10.0) src = gr.vector_source_c(src_data) - op = blocks_swig.complex_to_imag() + op = blocks.complex_to_imag() dst = gr.vector_sink_f() self.tb.connect(src, op, dst) self.tb.run() @@ -121,7 +121,7 @@ class test_type_conversions(gr_unittest.TestCase): src_data = (1+2j, 3-4j, 5+6j, 7-8j, -9+10j) expected_data = (sqrt(5), sqrt(25), sqrt(61), sqrt(113), sqrt(181)) src = gr.vector_source_c(src_data) - op = blocks_swig.complex_to_mag() + op = blocks.complex_to_mag() dst = gr.vector_sink_f() self.tb.connect(src, op, dst) self.tb.run() @@ -131,7 +131,7 @@ class test_type_conversions(gr_unittest.TestCase): src_data = (1+2j, 3-4j, 5+6j, 7-8j, -9+10j) expected_data = (5.0, 25.0, 61.0, 113.0, 181.0) src = gr.vector_source_c(src_data) - op = blocks_swig.complex_to_mag_squared() + op = blocks.complex_to_mag_squared() dst = gr.vector_sink_f() self.tb.connect(src, op, dst) self.tb.run() @@ -141,7 +141,7 @@ class test_type_conversions(gr_unittest.TestCase): src_data = (1+2j, 3-4j, 5+6j, 7-8j, -9+10j) expected_data = (atan2(2, 1), atan2(-4,3), atan2(6, 5), atan2(-8, 7), atan2(10,-9)) src = gr.vector_source_c(src_data) - op = blocks_swig.complex_to_arg() + op = blocks.complex_to_arg() dst = gr.vector_sink_f() self.tb.connect(src, op, dst) self.tb.run() @@ -151,7 +151,7 @@ class test_type_conversions(gr_unittest.TestCase): src_data = (1.0, 2.0, 3.0, 4.0, 5.0) expected_data = (1, 2, 3, 4, 5) src = gr.vector_source_f(src_data) - op = blocks_swig.float_to_char() + op = blocks.float_to_char() dst = gr.vector_sink_b() self.tb.connect(src, op, dst) self.tb.run() @@ -161,7 +161,7 @@ class test_type_conversions(gr_unittest.TestCase): src_data = (1.0, 2.0, 3.0, 4.0, 5.0) expected_data = (5, 10, 15, 20, 25) src = gr.vector_source_f(src_data) - op = blocks_swig.float_to_char(1, 5) + op = blocks.float_to_char(1, 5) dst = gr.vector_sink_b() self.tb.connect(src, op, dst) self.tb.run() @@ -171,7 +171,7 @@ class test_type_conversions(gr_unittest.TestCase): src_data = (1.0, 3.0, 5.0, 7.0, 9.0) expected_data = (1+0j, 3+0j, 5+0j, 7+0j, 9+0j) src = gr.vector_source_f(src_data) - op = blocks_swig.float_to_complex() + op = blocks.float_to_complex() dst = gr.vector_sink_c() self.tb.connect(src, op, dst) self.tb.run() @@ -183,7 +183,7 @@ class test_type_conversions(gr_unittest.TestCase): expected_data = (1+2j, 3+4j, 5+6j, 7+8j, 9+10j) src1 = gr.vector_source_f(src1_data) src2 = gr.vector_source_f(src2_data) - op = blocks_swig.float_to_complex() + op = blocks.float_to_complex() dst = gr.vector_sink_c() self.tb.connect(src1, (op, 0)) self.tb.connect(src2, (op, 1)) @@ -195,7 +195,7 @@ class test_type_conversions(gr_unittest.TestCase): src_data = (1.0, 2.0, 3.0, 4.0, 5.0) expected_data = (1, 2, 3, 4, 5) src = gr.vector_source_f(src_data) - op = blocks_swig.float_to_int() + op = blocks.float_to_int() dst = gr.vector_sink_i() self.tb.connect(src, op, dst) self.tb.run() @@ -205,7 +205,7 @@ class test_type_conversions(gr_unittest.TestCase): src_data = (1.0, 2.0, 3.0, 4.0, 5.0) expected_data = (5, 10, 15, 20, 25) src = gr.vector_source_f(src_data) - op = blocks_swig.float_to_int(1, 5) + op = blocks.float_to_int(1, 5) dst = gr.vector_sink_i() self.tb.connect(src, op, dst) self.tb.run() @@ -215,7 +215,7 @@ class test_type_conversions(gr_unittest.TestCase): src_data = (1.0, 2.0, 3.0, 4.0, 5.0) expected_data = (1, 2, 3, 4, 5) src = gr.vector_source_f(src_data) - op = blocks_swig.float_to_short() + op = blocks.float_to_short() dst = gr.vector_sink_s() self.tb.connect(src, op, dst) self.tb.run() @@ -225,7 +225,7 @@ class test_type_conversions(gr_unittest.TestCase): src_data = (1.0, 2.0, 3.0, 4.0, 5.0) expected_data = (5, 10, 15, 20, 25) src = gr.vector_source_f(src_data) - op = blocks_swig.float_to_short(1, 5) + op = blocks.float_to_short(1, 5) dst = gr.vector_sink_s() self.tb.connect(src, op, dst) self.tb.run() @@ -235,7 +235,7 @@ class test_type_conversions(gr_unittest.TestCase): src_data = (1.0, -2.0, 3.0, -4.0, 256.0) expected_data = (1, 0, 3, 0, 255) src = gr.vector_source_f(src_data) - op = blocks_swig.float_to_uchar() + op = blocks.float_to_uchar() dst = gr.vector_sink_b() self.tb.connect(src, op, dst) self.tb.run() @@ -245,7 +245,7 @@ class test_type_conversions(gr_unittest.TestCase): src_data = (1, 2, 3, 4, 5) expected_data = (1.0, 2.0, 3.0, 4.0, 5.0) src = gr.vector_source_i(src_data) - op = blocks_swig.int_to_float() + op = blocks.int_to_float() dst = gr.vector_sink_f() self.tb.connect(src, op, dst) self.tb.run() @@ -255,7 +255,7 @@ class test_type_conversions(gr_unittest.TestCase): src_data = (1, 2, 3, 4, 5) expected_data = (0.2, 0.4, 0.6, 0.8, 1.0) src = gr.vector_source_i(src_data) - op = blocks_swig.int_to_float(1, 5) + op = blocks.int_to_float(1, 5) dst = gr.vector_sink_f() self.tb.connect(src, op, dst) self.tb.run() @@ -265,7 +265,7 @@ class test_type_conversions(gr_unittest.TestCase): src_data = (1, 2, 3, 4, 5, 6, 7, 8, 9, 10) expected_data = (1+2j, 3+4j, 5+6j, 7+8j, 9+10j) src = gr.vector_source_s(src_data) - op = blocks_swig.interleaved_short_to_complex() + op = blocks.interleaved_short_to_complex() dst = gr.vector_sink_c() self.tb.connect(src, op, dst) self.tb.run() @@ -275,7 +275,7 @@ class test_type_conversions(gr_unittest.TestCase): src_data = (256, 512, 768, 1024, 1280) expected_data = (1, 2, 3, 4, 5) src = gr.vector_source_s(src_data) - op = blocks_swig.short_to_char() + op = blocks.short_to_char() dst = gr.vector_sink_b() self.tb.connect(src, op, dst) self.tb.run() @@ -285,7 +285,7 @@ class test_type_conversions(gr_unittest.TestCase): src_data = (1, 2, 3, 4, 5) expected_data = (1.0, 2.0, 3.0, 4.0, 5.0) src = gr.vector_source_s(src_data) - op = blocks_swig.short_to_float() + op = blocks.short_to_float() dst = gr.vector_sink_f() self.tb.connect(src, op, dst) self.tb.run() @@ -295,7 +295,7 @@ class test_type_conversions(gr_unittest.TestCase): src_data = (5, 10, 15, 20, 25) expected_data = (1.0, 2.0, 3.0, 4.0, 5.0) src = gr.vector_source_s(src_data) - op = blocks_swig.short_to_float(1, 5) + op = blocks.short_to_float(1, 5) dst = gr.vector_sink_f() self.tb.connect(src, op, dst) self.tb.run() @@ -305,7 +305,7 @@ class test_type_conversions(gr_unittest.TestCase): src_data = (1, 2, 3, 4, 5) expected_data = (1.0, 2.0, 3.0, 4.0, 5.0) src = gr.vector_source_b(src_data) - op = blocks_swig.uchar_to_float() + op = blocks.uchar_to_float() dst = gr.vector_sink_f() self.tb.connect(src, op, dst) self.tb.run() diff --git a/gr-blocks/python/blocks/qa_unpack_k_bits.py b/gr-blocks/python/blocks/qa_unpack_k_bits.py index e038d5a03a..ffa00824d6 100755 --- a/gr-blocks/python/blocks/qa_unpack_k_bits.py +++ b/gr-blocks/python/blocks/qa_unpack_k_bits.py @@ -20,8 +20,8 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, gr_unittest -import blocks_swig as blocks +from gnuradio import gr, gr_unittest, blocks + import random class test_unpack(gr_unittest.TestCase): |