44 files changed, 88 insertions, 110 deletions
diff --git a/gr-blocks/CMakeLists.txt b/gr-blocks/CMakeLists.txt
index c39337d0d5..fdaf40a7bd 100644
--- a/gr-blocks/CMakeLists.txt
+++ b/gr-blocks/CMakeLists.txt
@@ -86,7 +86,7 @@ add_subdirectory(lib)
 #  add_subdirectory(tests)
 #endif(ENABLE_TESTING)
 if(ENABLE_PYTHON)
-     add_subdirectory(python)
+     add_subdirectory(python/blocks)
      add_subdirectory(swig)
      add_subdirectory(grc)
      add_subdirectory(doc)
diff --git a/gr-blocks/python/CMakeLists.txt b/gr-blocks/python/blocks/CMakeLists.txt
index 7440e4e9df..aa8d3b6c81 100644
--- a/gr-blocks/python/CMakeLists.txt
+++ b/gr-blocks/python/blocks/CMakeLists.txt
@@ -34,29 +34,27 @@ 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)
-
-include(GrTest)
-
-# Grab all QA test blocks.
-file(GLOB py_qa_test_files "qa_*.py")
-
-# Force out the controlport QA tests if we've disabled it.
-if(NOT ENABLE_GR_CTRLPORT)
-  list(REMOVE_ITEM py_qa_test_files
-    ${CMAKE_CURRENT_SOURCE_DIR}/qa_cpp_py_binding.py
-    ${CMAKE_CURRENT_SOURCE_DIR}/qa_cpp_py_binding_set.py
+  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
     )
-endif(NOT ENABLE_GR_CTRLPORT)
 
-# Setup tests for all valid QA files.
-foreach(py_qa_test_file ${py_qa_test_files})
+  include(GrTest)
+  file(GLOB py_qa_test_files "qa_*.py")
+
+  # Force out the controlport QA tests if we've disabled it.
+  if(NOT ENABLE_GR_CTRLPORT)
+    list(REMOVE_ITEM py_qa_test_files
+      ${CMAKE_CURRENT_SOURCE_DIR}/qa_cpp_py_binding.py
+      ${CMAKE_CURRENT_SOURCE_DIR}/qa_cpp_py_binding_set.py
+      )
+  endif(NOT ENABLE_GR_CTRLPORT)
+  
+  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/__init__.py b/gr-blocks/python/blocks/__init__.py
index 56d274918c..4274ac54ab 100644
--- a/gr-blocks/python/__init__.py
+++ b/gr-blocks/python/blocks/__init__.py
@@ -23,8 +23,15 @@
 This is the gr-blocks package. This package provides GNU Radio
 processing blocks common to many flowgraphs.
 '''
+import os
 
-from blocks_swig import *
+try:
+    from blocks_swig import *
+except ImportError:
+    dirname, filename = os.path.split(os.path.abspath(__file__))
+    __path__.append(os.path.join(dirname, "..", "..", "swig"))
+    from blocks_swig import *
+    
 from stream_to_vector_decimator import *
 
 #alias old add_vXX and multiply_vXX
diff --git a/gr-blocks/python/parse_file_metadata.py b/gr-blocks/python/blocks/parse_file_metadata.py
index a876f49b07..a876f49b07 100644
--- a/gr-blocks/python/parse_file_metadata.py
+++ b/gr-blocks/python/blocks/parse_file_metadata.py
diff --git a/gr-blocks/python/qa_add_mult_div_sub.py b/gr-blocks/python/blocks/qa_add_mult_div_sub.py
index 6d48a6c389..7c9b2beac0 100755
--- a/gr-blocks/python/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 as blocks
+from gnuradio import gr, gr_unittest, blocks
 
 class test_add_mult_div_sub(gr_unittest.TestCase):
 
diff --git a/gr-blocks/python/qa_add_mult_v.py b/gr-blocks/python/blocks/qa_add_mult_v.py
index 39040b159a..721ee4eca6 100755
--- a/gr-blocks/python/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/qa_argmax.py b/gr-blocks/python/blocks/qa_argmax.py
index 2fc8641d16..fead481c0f 100644
--- a/gr-blocks/python/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/qa_bin_statistics.py b/gr-blocks/python/blocks/qa_bin_statistics.py
index 45d5105eb2..52b8585721 100755
--- a/gr-blocks/python/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/qa_boolean_operators.py b/gr-blocks/python/blocks/qa_boolean_operators.py
index 8755dad2fc..cbcd5688a1 100755
--- a/gr-blocks/python/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 as blocks
+from gnuradio import gr, gr_unittest, blocks
 
 class test_boolean_operators (gr_unittest.TestCase):
 
diff --git a/gr-blocks/python/qa_burst_tagger.py b/gr-blocks/python/blocks/qa_burst_tagger.py
index 9923d2a368..50aaf893bd 100644
--- a/gr-blocks/python/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/qa_conjugate.py b/gr-blocks/python/blocks/qa_conjugate.py
index 7aab2e70a7..36172e30a0 100644
--- a/gr-blocks/python/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 as blocks
+from gnuradio import gr, gr_unittest, blocks
 
 class test_conjugate (gr_unittest.TestCase):
 
diff --git a/gr-blocks/python/qa_delay.py b/gr-blocks/python/blocks/qa_delay.py
index 44b87c14ae..a0853309b3 100755
--- a/gr-blocks/python/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/qa_file_metadata.py b/gr-blocks/python/blocks/qa_file_metadata.py
index 3112ea69b0..4b262e5c40 100644
--- a/gr-blocks/python/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/qa_integrate.py b/gr-blocks/python/blocks/qa_integrate.py
index 9d9d9345f4..6128169a61 100755
--- a/gr-blocks/python/qa_integrate.py
+++ b/gr-blocks/python/blocks/qa_integrate.py
@@ -20,9 +20,7 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr, gr_unittest
-import blocks_swig as blocks
-import math
+from gnuradio import gr, gr_unittest, blocks
 
 class test_integrate (gr_unittest.TestCase):
 
diff --git a/gr-blocks/python/qa_interleave.py b/gr-blocks/python/blocks/qa_interleave.py
index a65824ec33..9eaf87c83c 100755
--- a/gr-blocks/python/qa_interleave.py
+++ b/gr-blocks/python/blocks/qa_interleave.py
@@ -20,9 +20,7 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr, gr_unittest
-import blocks_swig as blocks
-import math
+from gnuradio import gr, gr_unittest, blocks
 
 class test_interleave (gr_unittest.TestCase):
 
diff --git a/gr-blocks/python/qa_keep_m_in_n.py b/gr-blocks/python/blocks/qa_keep_m_in_n.py
index 22e8c45138..4db48335b2 100755
--- a/gr-blocks/python/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 as blocks
+from gnuradio import gr, gr_unittest, blocks
+
 import sys
 import random
 
diff --git a/gr-blocks/python/qa_keep_one_in_n.py b/gr-blocks/python/blocks/qa_keep_one_in_n.py
index f06ed33d6b..d8251fe611 100755
--- a/gr-blocks/python/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 as blocks
+from gnuradio import gr, gr_unittest, blocks
 
 class test_keep_one_in_n(gr_unittest.TestCase):
 
diff --git a/gr-blocks/python/qa_max.py b/gr-blocks/python/blocks/qa_max.py
index 982f4b5590..441582ac88 100755
--- a/gr-blocks/python/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/qa_message.py b/gr-blocks/python/blocks/qa_message.py
index 27cf186ed3..abfc652199 100755
--- a/gr-blocks/python/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/qa_moving_average.py b/gr-blocks/python/blocks/qa_moving_average.py
index d3fbdbbfdf..2c58805925 100644
--- a/gr-blocks/python/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/qa_multiply_conjugate.py b/gr-blocks/python/blocks/qa_multiply_conjugate.py
index a18d80324c..c2391f1410 100644
--- a/gr-blocks/python/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 as blocks
+from gnuradio import gr, gr_unittest, blocks
 
 class test_multiply_conjugate (gr_unittest.TestCase):
 
diff --git a/gr-blocks/python/qa_mute.py b/gr-blocks/python/blocks/qa_mute.py
index 0c10846333..97ee5bd821 100755
--- a/gr-blocks/python/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/qa_nlog10.py b/gr-blocks/python/blocks/qa_nlog10.py
index a61313cacc..0194e85d48 100755
--- a/gr-blocks/python/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 as blocks
+from gnuradio import gr, gr_unittest, blocks
 
 class test_nlog10(gr_unittest.TestCase):
 
diff --git a/gr-blocks/python/qa_pack_k_bits.py b/gr-blocks/python/blocks/qa_pack_k_bits.py
index 51152889f6..b73bf3d5a9 100755
--- a/gr-blocks/python/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/qa_packed_to_unpacked.py b/gr-blocks/python/blocks/qa_packed_to_unpacked.py
index 23745d3859..02dc872490 100755
--- a/gr-blocks/python/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/qa_patterned_interleaver.py b/gr-blocks/python/blocks/qa_patterned_interleaver.py
index c960ac2e66..c9fe7b123b 100755
--- a/gr-blocks/python/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/qa_pdu.py b/gr-blocks/python/blocks/qa_pdu.py
index a9d8ea86f3..685d1dbaae 100755
--- a/gr-blocks/python/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/qa_peak_detector.py b/gr-blocks/python/blocks/qa_peak_detector.py
index 4b28518410..c855e92530 100644
--- a/gr-blocks/python/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/qa_peak_detector2.py b/gr-blocks/python/blocks/qa_peak_detector2.py
index 5fcda9be08..475897eac2 100644
--- a/gr-blocks/python/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/qa_pipe_fittings.py b/gr-blocks/python/blocks/qa_pipe_fittings.py
index 634638dcdd..bc29cc750e 100755
--- a/gr-blocks/python/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/qa_probe_signal.py b/gr-blocks/python/blocks/qa_probe_signal.py
index 1cb151bfc0..8194cafdb0 100644
--- a/gr-blocks/python/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/qa_regenerate.py b/gr-blocks/python/blocks/qa_regenerate.py
index 0be68d001c..52b6bdb515 100755
--- a/gr-blocks/python/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/qa_repeat.py b/gr-blocks/python/blocks/qa_repeat.py
index aa1b1f45f1..eaf20d4e27 100755
--- a/gr-blocks/python/qa_repeat.py
+++ b/gr-blocks/python/blocks/qa_repeat.py
@@ -20,9 +20,7 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr, gr_unittest
-import blocks_swig as blocks
-import math
+from gnuradio import gr, gr_unittest, blocks
 
 class test_repeat (gr_unittest.TestCase):
 
diff --git a/gr-blocks/python/qa_rms.py b/gr-blocks/python/blocks/qa_rms.py
index 3dac70c1ec..0b07c37bdc 100644
--- a/gr-blocks/python/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/qa_sample_and_hold.py b/gr-blocks/python/blocks/qa_sample_and_hold.py
index 87d472a038..d6aedc23cc 100644
--- a/gr-blocks/python/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/qa_stream_mux.py b/gr-blocks/python/blocks/qa_stream_mux.py
index a5004dd8da..7abbced54c 100755
--- a/gr-blocks/python/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 as blocks
+from gnuradio import gr, gr_unittest, blocks
+
 import os
 
 class test_stream_mux (gr_unittest.TestCase):
diff --git a/gr-blocks/python/qa_stretch.py b/gr-blocks/python/blocks/qa_stretch.py
index 94bb6e0353..66a04d53f6 100755
--- a/gr-blocks/python/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/qa_tag_debug.py b/gr-blocks/python/blocks/qa_tag_debug.py
index 52864d34fb..5ccb285a5d 100755
--- a/gr-blocks/python/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/qa_threshold.py b/gr-blocks/python/blocks/qa_threshold.py
index 352a14da9e..49798426f3 100644
--- a/gr-blocks/python/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/qa_throttle.py b/gr-blocks/python/blocks/qa_throttle.py
index 5d462f2c9f..7d18e87ade 100755
--- a/gr-blocks/python/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/qa_transcendental.py b/gr-blocks/python/blocks/qa_transcendental.py
index b57b0b4430..1da56381f4 100644
--- a/gr-blocks/python/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/qa_type_conversions.py b/gr-blocks/python/blocks/qa_type_conversions.py
index 548ab33926..0246320159 100755
--- a/gr-blocks/python/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 as blocks
+from gnuradio import gr, gr_unittest, blocks
+
 from math import sqrt, atan2
 
 class test_type_conversions(gr_unittest.TestCase):
diff --git a/gr-blocks/python/qa_unpack_k_bits.py b/gr-blocks/python/blocks/qa_unpack_k_bits.py
index dd7024f74c..765c459dfa 100755
--- a/gr-blocks/python/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):
diff --git a/gr-blocks/python/stream_to_vector_decimator.py b/gr-blocks/python/blocks/stream_to_vector_decimator.py
index c32ae6fce2..c32ae6fce2 100644
--- a/gr-blocks/python/stream_to_vector_decimator.py
+++ b/gr-blocks/python/blocks/stream_to_vector_decimator.py