summaryrefslogtreecommitdiff
path: root/gr-blocks/python
diff options
context:
space:
mode:
Diffstat (limited to 'gr-blocks/python')
-rw-r--r--gr-blocks/python/blocks/parse_file_metadata.py7
-rw-r--r--gr-blocks/python/blocks/qa_affinity.py (renamed from gr-blocks/python/qa_affinity.py)3
-rw-r--r--gr-blocks/python/blocks/qa_block_gateway.py (renamed from gr-blocks/python/qa_block_gateway.py)7
-rwxr-xr-xgr-blocks/python/blocks/qa_copy.py (renamed from gr-blocks/python/qa_copy.py)3
-rwxr-xr-xgr-blocks/python/blocks/qa_cpp_py_binding.py (renamed from gr-blocks/python/qa_cpp_py_binding.py)4
-rwxr-xr-xgr-blocks/python/blocks/qa_cpp_py_binding_set.py (renamed from gr-blocks/python/qa_cpp_py_binding_set.py)4
-rw-r--r--gr-blocks/python/blocks/qa_endian_swap.py (renamed from gr-blocks/python/qa_endian_swap.py)3
-rw-r--r--gr-blocks/python/blocks/qa_file_source_sink.py (renamed from gr-blocks/python/qa_file_source_sink.py)3
-rwxr-xr-xgr-blocks/python/blocks/qa_head.py (renamed from gr-blocks/python/qa_head.py)3
-rwxr-xr-xgr-blocks/python/blocks/qa_hier_block2.py (renamed from gr-blocks/python/qa_hier_block2.py)3
-rw-r--r--gr-blocks/python/blocks/qa_message_tags.py (renamed from gr-blocks/python/qa_message_tags.py)3
-rw-r--r--gr-blocks/python/blocks/qa_null_sink_source.py (renamed from gr-blocks/python/qa_null_sink_source.py)3
-rwxr-xr-xgr-blocks/python/blocks/qa_plateau_detector_fb.py (renamed from gr-blocks/python/qa_plateau_detector_fb.py)3
-rw-r--r--gr-blocks/python/blocks/qa_python_message_passing.py (renamed from gr-blocks/python/qa_python_message_passing.py)3
-rwxr-xr-xgr-blocks/python/blocks/qa_repack_bits_bb.py (renamed from gr-blocks/python/qa_repack_bits_bb.py)3
-rwxr-xr-xgr-blocks/python/blocks/qa_skiphead.py (renamed from gr-blocks/python/qa_skiphead.py)3
-rw-r--r--gr-blocks/python/blocks/qa_tag_file_sink.py (renamed from gr-blocks/python/qa_tag_file_sink.py)3
-rwxr-xr-xgr-blocks/python/blocks/qa_tag_gate.py (renamed from gr-blocks/python/qa_tag_gate.py)3
-rwxr-xr-xgr-blocks/python/blocks/qa_tagged_stream_mux.py (renamed from gr-blocks/python/qa_tagged_stream_mux.py)3
-rw-r--r--gr-blocks/python/blocks/qa_udp_source_sink.py (renamed from gr-blocks/python/qa_udp_source_sink.py)3
-rw-r--r--gr-blocks/python/blocks/qa_vco.py (renamed from gr-blocks/python/qa_vco.py)3
-rwxr-xr-xgr-blocks/python/blocks/qa_vector_insert.py (renamed from gr-blocks/python/qa_vector_insert.py)3
-rw-r--r--gr-blocks/python/blocks/qa_vector_map.py (renamed from gr-blocks/python/qa_vector_map.py)3
-rwxr-xr-xgr-blocks/python/blocks/qa_vector_sink_source.py (renamed from gr-blocks/python/qa_vector_sink_source.py)3
-rwxr-xr-xgr-blocks/python/blocks/qa_wavfile.py (renamed from gr-blocks/python/qa_wavfile.py)3
-rw-r--r--gr-blocks/python/blocks/stream_to_vector_decimator.py6
-rw-r--r--gr-blocks/python/blocks/test_16bit_1chunk.wav (renamed from gr-blocks/python/test_16bit_1chunk.wav)bin52 -> 52 bytes
27 files changed, 29 insertions, 62 deletions
diff --git a/gr-blocks/python/blocks/parse_file_metadata.py b/gr-blocks/python/blocks/parse_file_metadata.py
index a876f49b07..7d8d41d166 100644
--- a/gr-blocks/python/blocks/parse_file_metadata.py
+++ b/gr-blocks/python/blocks/parse_file_metadata.py
@@ -21,14 +21,9 @@
#
import sys
-from gnuradio import gr
+from gnuradio import gr, blocks
import pmt
-try:
- import blocks_swig as blocks
-except ImportError:
- from gnuradio import blocks
-
'''
sr Sample rate (samples/second)
time Time as uint64(secs), double(fractional secs)
diff --git a/gr-blocks/python/qa_affinity.py b/gr-blocks/python/blocks/qa_affinity.py
index f06b2804fe..98b5c44862 100644
--- a/gr-blocks/python/qa_affinity.py
+++ b/gr-blocks/python/blocks/qa_affinity.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_affinity(gr_unittest.TestCase):
diff --git a/gr-blocks/python/qa_block_gateway.py b/gr-blocks/python/blocks/qa_block_gateway.py
index 20a2660cba..f62726adf3 100644
--- a/gr-blocks/python/qa_block_gateway.py
+++ b/gr-blocks/python/blocks/qa_block_gateway.py
@@ -19,10 +19,11 @@
# Boston, MA 02110-1301, USA.
#
-from gnuradio import gr, gr_unittest
-import pmt
import numpy
-import blocks_swig as blocks
+
+import pmt
+
+from gnuradio import gr, gr_unittest, blocks
class add_2_f32_1_f32(gr.sync_block):
def __init__(self):
diff --git a/gr-blocks/python/qa_copy.py b/gr-blocks/python/blocks/qa_copy.py
index 04f6454231..20914b51e3 100755
--- a/gr-blocks/python/qa_copy.py
+++ b/gr-blocks/python/blocks/qa_copy.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_copy(gr_unittest.TestCase):
diff --git a/gr-blocks/python/qa_cpp_py_binding.py b/gr-blocks/python/blocks/qa_cpp_py_binding.py
index c3d6a3f3bc..c15633df82 100755
--- a/gr-blocks/python/qa_cpp_py_binding.py
+++ b/gr-blocks/python/blocks/qa_cpp_py_binding.py
@@ -26,14 +26,12 @@
import Ice
import sys, time, random, numpy
-from gnuradio import gr, gr_unittest
+from gnuradio import gr, gr_unittest, blocks
from gnuradio.ctrlport import GNURadio
from gnuradio import ctrlport
import os
-import blocks_swig as blocks
-
def get1():
return "success"
diff --git a/gr-blocks/python/qa_cpp_py_binding_set.py b/gr-blocks/python/blocks/qa_cpp_py_binding_set.py
index 28ddc48b2f..2e4198c04d 100755
--- a/gr-blocks/python/qa_cpp_py_binding_set.py
+++ b/gr-blocks/python/blocks/qa_cpp_py_binding_set.py
@@ -26,14 +26,12 @@
import Ice
import sys, time, random, numpy
-from gnuradio import gr, gr_unittest
+from gnuradio import gr, gr_unittest, blocks
from gnuradio.ctrlport import GNURadio
from gnuradio import ctrlport
import os
-import blocks_swig as blocks
-
class inc_class:
def __init__(self,val):
self.val = val;
diff --git a/gr-blocks/python/qa_endian_swap.py b/gr-blocks/python/blocks/qa_endian_swap.py
index 5180293052..ea6e10fb8f 100644
--- a/gr-blocks/python/qa_endian_swap.py
+++ b/gr-blocks/python/blocks/qa_endian_swap.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
import ctypes
class test_endian_swap(gr_unittest.TestCase):
diff --git a/gr-blocks/python/qa_file_source_sink.py b/gr-blocks/python/blocks/qa_file_source_sink.py
index cf3b512db0..f35912b229 100644
--- a/gr-blocks/python/qa_file_source_sink.py
+++ b/gr-blocks/python/blocks/qa_file_source_sink.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
import os
class test_file_source_sink(gr_unittest.TestCase):
diff --git a/gr-blocks/python/qa_head.py b/gr-blocks/python/blocks/qa_head.py
index 39b1255978..9b5bca221b 100755
--- a/gr-blocks/python/qa_head.py
+++ b/gr-blocks/python/blocks/qa_head.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_head(gr_unittest.TestCase):
diff --git a/gr-blocks/python/qa_hier_block2.py b/gr-blocks/python/blocks/qa_hier_block2.py
index f482fda8cf..51f420e8eb 100755
--- a/gr-blocks/python/qa_hier_block2.py
+++ b/gr-blocks/python/blocks/qa_hier_block2.py
@@ -1,7 +1,6 @@
#!/usr/bin/env python
-from gnuradio import gr, gr_unittest
-import blocks_swig as blocks
+from gnuradio import gr, gr_unittest, blocks
import numpy
class add_ff(gr.sync_block):
diff --git a/gr-blocks/python/qa_message_tags.py b/gr-blocks/python/blocks/qa_message_tags.py
index ad4d2104e6..0d4f77bf9f 100644
--- a/gr-blocks/python/qa_message_tags.py
+++ b/gr-blocks/python/blocks/qa_message_tags.py
@@ -1,7 +1,6 @@
import time
-from gnuradio import gr, gr_unittest
-import blocks_swig as blocks
+from gnuradio import gr, gr_unittest, blocks
class test_message_tags (gr_unittest.TestCase):
diff --git a/gr-blocks/python/qa_null_sink_source.py b/gr-blocks/python/blocks/qa_null_sink_source.py
index 60552cb207..03d6ab14c1 100644
--- a/gr-blocks/python/qa_null_sink_source.py
+++ b/gr-blocks/python/blocks/qa_null_sink_source.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
import math
class test_null_sink_source(gr_unittest.TestCase):
diff --git a/gr-blocks/python/qa_plateau_detector_fb.py b/gr-blocks/python/blocks/qa_plateau_detector_fb.py
index 2f4b643fe0..003c4ea74d 100755
--- a/gr-blocks/python/qa_plateau_detector_fb.py
+++ b/gr-blocks/python/blocks/qa_plateau_detector_fb.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 qa_plateau_detector_fb (gr_unittest.TestCase):
diff --git a/gr-blocks/python/qa_python_message_passing.py b/gr-blocks/python/blocks/qa_python_message_passing.py
index 58bf9e59bd..6eade7556b 100644
--- a/gr-blocks/python/qa_python_message_passing.py
+++ b/gr-blocks/python/blocks/qa_python_message_passing.py
@@ -20,11 +20,10 @@
# Boston, MA 02110-1301, USA.
#
-from gnuradio import gr, gr_unittest
+from gnuradio import gr, gr_unittest, blocks
import pmt
import numpy
import time
-import blocks_swig as blocks
# Simple block to generate messages
class message_generator(gr.sync_block):
diff --git a/gr-blocks/python/qa_repack_bits_bb.py b/gr-blocks/python/blocks/qa_repack_bits_bb.py
index 209b6e1324..d9bbfe4fac 100755
--- a/gr-blocks/python/qa_repack_bits_bb.py
+++ b/gr-blocks/python/blocks/qa_repack_bits_bb.py
@@ -21,9 +21,8 @@
#
import random
-from gnuradio import gr, gr_unittest
+from gnuradio import gr, gr_unittest, blocks
import pmt
-import blocks_swig as blocks
class qa_repack_bits_bb (gr_unittest.TestCase):
diff --git a/gr-blocks/python/qa_skiphead.py b/gr-blocks/python/blocks/qa_skiphead.py
index 50a9bbc639..a9b6df40cf 100755
--- a/gr-blocks/python/qa_skiphead.py
+++ b/gr-blocks/python/blocks/qa_skiphead.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_skiphead(gr_unittest.TestCase):
diff --git a/gr-blocks/python/qa_tag_file_sink.py b/gr-blocks/python/blocks/qa_tag_file_sink.py
index e41e6544fd..250ad1addf 100644
--- a/gr-blocks/python/qa_tag_file_sink.py
+++ b/gr-blocks/python/blocks/qa_tag_file_sink.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
import os, struct
class test_tag_file_sink(gr_unittest.TestCase):
diff --git a/gr-blocks/python/qa_tag_gate.py b/gr-blocks/python/blocks/qa_tag_gate.py
index 1999f7a35d..74fe5a7bcd 100755
--- a/gr-blocks/python/qa_tag_gate.py
+++ b/gr-blocks/python/blocks/qa_tag_gate.py
@@ -18,9 +18,8 @@
# Boston, MA 02110-1301, USA.
#
-from gnuradio import gr, gr_unittest
+from gnuradio import gr, gr_unittest, blocks
import pmt
-import blocks_swig as blocks
class qa_tag_gate (gr_unittest.TestCase):
diff --git a/gr-blocks/python/qa_tagged_stream_mux.py b/gr-blocks/python/blocks/qa_tagged_stream_mux.py
index e9c3343000..675d685aaa 100755
--- a/gr-blocks/python/qa_tagged_stream_mux.py
+++ b/gr-blocks/python/blocks/qa_tagged_stream_mux.py
@@ -20,9 +20,8 @@
# Boston, MA 02110-1301, USA.
#
-from gnuradio import gr, gr_unittest
+from gnuradio import gr, gr_unittest, blocks
import pmt
-import blocks_swig as blocks
import numpy
def make_len_tags(tupl, key):
diff --git a/gr-blocks/python/qa_udp_source_sink.py b/gr-blocks/python/blocks/qa_udp_source_sink.py
index ac8a9d0eb1..b96d393a50 100644
--- a/gr-blocks/python/qa_udp_source_sink.py
+++ b/gr-blocks/python/blocks/qa_udp_source_sink.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
import os
from threading import Timer
diff --git a/gr-blocks/python/qa_vco.py b/gr-blocks/python/blocks/qa_vco.py
index 23ff636d86..4ed2a71c04 100644
--- a/gr-blocks/python/qa_vco.py
+++ b/gr-blocks/python/blocks/qa_vco.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
import math
def sig_source_f(samp_rate, freq, amp, N):
diff --git a/gr-blocks/python/qa_vector_insert.py b/gr-blocks/python/blocks/qa_vector_insert.py
index e3c0d3102f..5f6e84665c 100755
--- a/gr-blocks/python/qa_vector_insert.py
+++ b/gr-blocks/python/blocks/qa_vector_insert.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
import math
class test_vector_insert(gr_unittest.TestCase):
diff --git a/gr-blocks/python/qa_vector_map.py b/gr-blocks/python/blocks/qa_vector_map.py
index 54565fe443..94bdb1989b 100644
--- a/gr-blocks/python/qa_vector_map.py
+++ b/gr-blocks/python/blocks/qa_vector_map.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
import math
class test_vector_map(gr_unittest.TestCase):
diff --git a/gr-blocks/python/qa_vector_sink_source.py b/gr-blocks/python/blocks/qa_vector_sink_source.py
index 169e6a4450..6c9f933668 100755
--- a/gr-blocks/python/qa_vector_sink_source.py
+++ b/gr-blocks/python/blocks/qa_vector_sink_source.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
import math
class test_vector_sink_source(gr_unittest.TestCase):
diff --git a/gr-blocks/python/qa_wavfile.py b/gr-blocks/python/blocks/qa_wavfile.py
index b40b9b7ec3..ce1806c5ef 100755
--- a/gr-blocks/python/qa_wavfile.py
+++ b/gr-blocks/python/blocks/qa_wavfile.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
import os
from os.path import getsize
diff --git a/gr-blocks/python/blocks/stream_to_vector_decimator.py b/gr-blocks/python/blocks/stream_to_vector_decimator.py
index c32ae6fce2..984d84b4bb 100644
--- a/gr-blocks/python/blocks/stream_to_vector_decimator.py
+++ b/gr-blocks/python/blocks/stream_to_vector_decimator.py
@@ -19,13 +19,9 @@
# Boston, MA 02110-1301, USA.
#
+import blocks_swig as blocks
from gnuradio import gr
-try:
- from gnuradio import blocks
-except ImportError:
- import blocks_swig as blocks
-
class stream_to_vector_decimator(gr.hier_block2):
"""
Convert the stream to a vector, decimate the vector stream to achieve the vector rate.
diff --git a/gr-blocks/python/test_16bit_1chunk.wav b/gr-blocks/python/blocks/test_16bit_1chunk.wav
index 0fe12a7a13..0fe12a7a13 100644
--- a/gr-blocks/python/test_16bit_1chunk.wav
+++ b/gr-blocks/python/blocks/test_16bit_1chunk.wav
Binary files differ
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-19 08:05:22 +0000