30 files changed, 44 insertions, 70 deletions
diff --git a/gr-analog/python/CMakeLists.txt b/gr-analog/python/analog/CMakeLists.txt
index e4d1d0aa74..182fc24860 100644
--- a/gr-analog/python/CMakeLists.txt
+++ b/gr-analog/python/analog/CMakeLists.txt
@@ -44,21 +44,18 @@ GR_PYTHON_INSTALL(
 ########################################################################
 if(ENABLE_TESTING)
 
-list(APPEND GR_TEST_PYTHON_DIRS
-    ${CMAKE_BINARY_DIR}/gr-analog/python
-    ${CMAKE_BINARY_DIR}/gr-analog/swig
-    ${CMAKE_BINARY_DIR}/gr-blocks/python
-    ${CMAKE_BINARY_DIR}/gr-blocks/swig
-    ${CMAKE_BINARY_DIR}/gr-filter/python
-    ${CMAKE_BINARY_DIR}/gr-filter/swig
-)
-list(APPEND GR_TEST_TARGET_DEPS gnuradio-analog gnuradio-filter gnuradio-fft)
+  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-analog/python/__init__.py b/gr-analog/python/analog/__init__.py
index a5ab5715d7..836d4ba935 100644
--- a/gr-analog/python/__init__.py
+++ b/gr-analog/python/analog/__init__.py
@@ -23,8 +23,14 @@ Blocks and utilities for analog modulation and demodulation.
 '''
 
 # The presence of this file turns this directory into a Python package
+import os
 
-from analog_swig import *
+try:
+    from analog_swig import *
+except ImportError:
+    dirname, filename = os.path.split(os.path.abspath(__file__))
+    __path__.append(os.path.join(dirname, "..", "..", "swig"))
+    from analog_swig import *
 
 from am_demod import *
 from fm_demod import *
diff --git a/gr-analog/python/am_demod.py b/gr-analog/python/analog/am_demod.py
index 3459e825f4..3459e825f4 100644
--- a/gr-analog/python/am_demod.py
+++ b/gr-analog/python/analog/am_demod.py
diff --git a/gr-analog/python/fm_demod.py b/gr-analog/python/analog/fm_demod.py
index 1976a076ca..1976a076ca 100644
--- a/gr-analog/python/fm_demod.py
+++ b/gr-analog/python/analog/fm_demod.py
diff --git a/gr-analog/python/fm_emph.py b/gr-analog/python/analog/fm_emph.py
index 2821f6e3cd..2821f6e3cd 100644
--- a/gr-analog/python/fm_emph.py
+++ b/gr-analog/python/analog/fm_emph.py
diff --git a/gr-analog/python/nbfm_rx.py b/gr-analog/python/analog/nbfm_rx.py
index b2c86db70f..b2c86db70f 100644
--- a/gr-analog/python/nbfm_rx.py
+++ b/gr-analog/python/analog/nbfm_rx.py
diff --git a/gr-analog/python/nbfm_tx.py b/gr-analog/python/analog/nbfm_tx.py
index 62b56bae52..62b56bae52 100644
--- a/gr-analog/python/nbfm_tx.py
+++ b/gr-analog/python/analog/nbfm_tx.py
diff --git a/gr-analog/python/qa_agc.py b/gr-analog/python/analog/qa_agc.py
index 0d8a7bfb5d..f274b04e7e 100755
--- a/gr-analog/python/qa_agc.py
+++ b/gr-analog/python/analog/qa_agc.py
@@ -20,10 +20,7 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr, gr_unittest
-import analog_swig as analog
-import blocks_swig as blocks
-import math
+from gnuradio import gr, gr_unittest, analog, blocks
 
 class test_agc(gr_unittest.TestCase):
 
@@ -33,7 +30,6 @@ class test_agc(gr_unittest.TestCase):
     def tearDown(self):
         self.tb = None
 
-
     def test_001_sets(self):
         agc = analog.agc_cc(1e-3, 1, 1, 1000)
 
diff --git a/gr-analog/python/qa_cpfsk.py b/gr-analog/python/analog/qa_cpfsk.py
index 7998d8079d..a33a6e6092 100755
--- a/gr-analog/python/qa_cpfsk.py
+++ b/gr-analog/python/analog/qa_cpfsk.py
@@ -20,11 +20,10 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr, gr_unittest
-import analog_swig as analog
-import blocks_swig as blocks
 import math
 
+from gnuradio import gr, gr_unittest, analog, blocks
+
 class test_cpfsk_bc(gr_unittest.TestCase):
 
     def setUp(self):
diff --git a/gr-analog/python/qa_ctcss_squelch.py b/gr-analog/python/analog/qa_ctcss_squelch.py
index 622cca234f..f5cfcbf976 100755
--- a/gr-analog/python/qa_ctcss_squelch.py
+++ b/gr-analog/python/analog/qa_ctcss_squelch.py
@@ -20,9 +20,7 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr, gr_unittest
-import analog_swig as analog
-import blocks_swig as blocks
+from gnuradio import gr, gr_unittest, analog, blocks
 
 class test_ctcss_squelch(gr_unittest.TestCase):
 
diff --git a/gr-analog/python/qa_dpll.py b/gr-analog/python/analog/qa_dpll.py
index 98ddf83eff..44b1486035 100755
--- a/gr-analog/python/qa_dpll.py
+++ b/gr-analog/python/analog/qa_dpll.py
@@ -20,10 +20,7 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr, gr_unittest
-import analog_swig as analog
-import blocks_swig as blocks
-import math
+from gnuradio import gr, gr_unittest, analog, blocks
 
 class test_dpll_bb(gr_unittest.TestCase):
 
diff --git a/gr-analog/python/qa_fastnoise.py b/gr-analog/python/analog/qa_fastnoise.py
index 040cf47522..91e1cb87b7 100644
--- a/gr-analog/python/qa_fastnoise.py
+++ b/gr-analog/python/analog/qa_fastnoise.py
@@ -20,8 +20,7 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr, gr_unittest
-import analog_swig as analog
+from gnuradio import gr, gr_unittest, analog
 
 class test_fastnoise_source(gr_unittest.TestCase):
 
diff --git a/gr-analog/python/qa_fmdet.py b/gr-analog/python/analog/qa_fmdet.py
index 6c99b08803..a9c88c3b95 100755
--- a/gr-analog/python/qa_fmdet.py
+++ b/gr-analog/python/analog/qa_fmdet.py
@@ -20,10 +20,7 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr, gr_unittest
-import analog_swig as analog
-import blocks_swig as blocks
-import math
+from gnuradio import gr, gr_unittest, analog, blocks
 
 class test_fmdet_cf(gr_unittest.TestCase):
 
diff --git a/gr-analog/python/qa_frequency_modulator.py b/gr-analog/python/analog/qa_frequency_modulator.py
index 7d6cff3fea..0f5c45b11a 100755
--- a/gr-analog/python/qa_frequency_modulator.py
+++ b/gr-analog/python/analog/qa_frequency_modulator.py
@@ -20,11 +20,10 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr, gr_unittest
-import analog_swig as analog
-import blocks_swig as blocks
 import math
 
+from gnuradio import gr, gr_unittest, analog, blocks
+
 def sincos(x):
     return  math.cos(x) + math.sin(x) * 1j
 
diff --git a/gr-analog/python/qa_noise.py b/gr-analog/python/analog/qa_noise.py
index dd94fc231f..5576773f23 100755
--- a/gr-analog/python/qa_noise.py
+++ b/gr-analog/python/analog/qa_noise.py
@@ -20,8 +20,7 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr, gr_unittest
-import analog_swig as analog
+from gnuradio import gr, gr_unittest, analog
 
 class test_noise_source(gr_unittest.TestCase):
 
diff --git a/gr-analog/python/qa_phase_modulator.py b/gr-analog/python/analog/qa_phase_modulator.py
index 81334177db..05fe2127c0 100755
--- a/gr-analog/python/qa_phase_modulator.py
+++ b/gr-analog/python/analog/qa_phase_modulator.py
@@ -20,11 +20,10 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr, gr_unittest
-import analog_swig as analog
-import blocks_swig as blocks
 import math
 
+from gnuradio import gr, gr_unittest, analog, blocks
+
 def sincos(x):
     return  math.cos(x) + math.sin(x) * 1j
 
diff --git a/gr-analog/python/qa_pll_carriertracking.py b/gr-analog/python/analog/qa_pll_carriertracking.py
index 2a6bb9f0b3..d05e49641a 100755
--- a/gr-analog/python/qa_pll_carriertracking.py
+++ b/gr-analog/python/analog/qa_pll_carriertracking.py
@@ -20,11 +20,10 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr, gr_unittest
-import analog_swig as analog
-import blocks_swig as blocks
 import math
 
+from gnuradio import gr, gr_unittest, analog, blocks
+
 class test_pll_carriertracking(gr_unittest.TestCase):
 
     def setUp (self):
diff --git a/gr-analog/python/qa_pll_freqdet.py b/gr-analog/python/analog/qa_pll_freqdet.py
index 11f2a9b959..0166a40258 100755
--- a/gr-analog/python/qa_pll_freqdet.py
+++ b/gr-analog/python/analog/qa_pll_freqdet.py
@@ -20,11 +20,10 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr, gr_unittest
-import analog_swig as analog
-import blocks_swig as blocks
 import math
 
+from gnuradio import gr, gr_unittest, analog, blocks
+
 class test_pll_freqdet(gr_unittest.TestCase):
 
     def setUp (self):
diff --git a/gr-analog/python/qa_pll_refout.py b/gr-analog/python/analog/qa_pll_refout.py
index f90e7c3ada..f85a027aa3 100755
--- a/gr-analog/python/qa_pll_refout.py
+++ b/gr-analog/python/analog/qa_pll_refout.py
@@ -20,11 +20,10 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr, gr_unittest
-import analog_swig as analog
-import blocks_swig as blocks
 import math
 
+from gnuradio import gr, gr_unittest, analog, blocks
+
 class test_pll_refout(gr_unittest.TestCase):
 
     def setUp(self):
diff --git a/gr-analog/python/qa_probe_avg_mag_sqrd.py b/gr-analog/python/analog/qa_probe_avg_mag_sqrd.py
index 930077c9c0..a52c0806e3 100755
--- a/gr-analog/python/qa_probe_avg_mag_sqrd.py
+++ b/gr-analog/python/analog/qa_probe_avg_mag_sqrd.py
@@ -20,11 +20,10 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr, gr_unittest
-import analog_swig as analog
-import blocks_swig as blocks
 import math
 
+from gnuradio import gr, gr_unittest, analog, blocks
+
 def avg_mag_sqrd_c(x, alpha):
     y = [0,]
     for xi in x:
diff --git a/gr-analog/python/qa_pwr_squelch.py b/gr-analog/python/analog/qa_pwr_squelch.py
index 238723ba3c..e366192f68 100755
--- a/gr-analog/python/qa_pwr_squelch.py
+++ b/gr-analog/python/analog/qa_pwr_squelch.py
@@ -20,9 +20,7 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr, gr_unittest
-import analog_swig as analog
-import blocks_swig as blocks
+from gnuradio import gr, gr_unittest, analog, blocks
 
 class test_pwr_squelch(gr_unittest.TestCase):
 
diff --git a/gr-analog/python/qa_quadrature_demod.py b/gr-analog/python/analog/qa_quadrature_demod.py
index 0a92bb12a5..bcf9aaa17f 100755
--- a/gr-analog/python/qa_quadrature_demod.py
+++ b/gr-analog/python/analog/qa_quadrature_demod.py
@@ -20,11 +20,10 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr, gr_unittest
-import analog_swig as analog
-import blocks_swig as blocks
 import cmath
 
+from gnuradio import gr, gr_unittest, analog, blocks
+
 class test_quadrature_demod(gr_unittest.TestCase):
 
     def setUp(self):
diff --git a/gr-analog/python/qa_rail_ff.py b/gr-analog/python/analog/qa_rail_ff.py
index 58ac01d7a6..4a7d3f3f7d 100755
--- a/gr-analog/python/qa_rail_ff.py
+++ b/gr-analog/python/analog/qa_rail_ff.py
@@ -20,9 +20,7 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr, gr_unittest
-import analog_swig as analog
-import blocks_swig as blocks
+from gnuradio import gr, gr_unittest, analog, blocks
 
 def clip(x, lo, hi):
     if(x < lo):
diff --git a/gr-analog/python/qa_sig_source.py b/gr-analog/python/analog/qa_sig_source.py
index 0aa03c7402..5ee4f24af8 100755
--- a/gr-analog/python/qa_sig_source.py
+++ b/gr-analog/python/analog/qa_sig_source.py
@@ -20,11 +20,10 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr, gr_unittest
-import analog_swig as analog
-import blocks_swig as blocks
 import math
 
+from gnuradio import gr, gr_unittest, analog, blocks
+
 class test_sig_source(gr_unittest.TestCase):
 
     def setUp(self):
diff --git a/gr-analog/python/qa_simple_squelch.py b/gr-analog/python/analog/qa_simple_squelch.py
index 2bd88e1489..35f28a6122 100755
--- a/gr-analog/python/qa_simple_squelch.py
+++ b/gr-analog/python/analog/qa_simple_squelch.py
@@ -20,9 +20,7 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr, gr_unittest
-import analog_swig as analog
-import blocks_swig as blocks
+from gnuradio import gr, gr_unittest, analog, blocks
 
 class test_simple_squelch(gr_unittest.TestCase):
 
diff --git a/gr-analog/python/standard_squelch.py b/gr-analog/python/analog/standard_squelch.py
index 3ed9ebceaa..3ed9ebceaa 100644
--- a/gr-analog/python/standard_squelch.py
+++ b/gr-analog/python/analog/standard_squelch.py
diff --git a/gr-analog/python/wfm_rcv.py b/gr-analog/python/analog/wfm_rcv.py
index d35d219275..d35d219275 100644
--- a/gr-analog/python/wfm_rcv.py
+++ b/gr-analog/python/analog/wfm_rcv.py
diff --git a/gr-analog/python/wfm_rcv_fmdet.py b/gr-analog/python/analog/wfm_rcv_fmdet.py
index b7cd1458fb..b7cd1458fb 100644
--- a/gr-analog/python/wfm_rcv_fmdet.py
+++ b/gr-analog/python/analog/wfm_rcv_fmdet.py
diff --git a/gr-analog/python/wfm_rcv_pll.py b/gr-analog/python/analog/wfm_rcv_pll.py
index 282e2b14be..282e2b14be 100644
--- a/gr-analog/python/wfm_rcv_pll.py
+++ b/gr-analog/python/analog/wfm_rcv_pll.py
diff --git a/gr-analog/python/wfm_tx.py b/gr-analog/python/analog/wfm_tx.py
index be662310db..be662310db 100644
--- a/gr-analog/python/wfm_tx.py
+++ b/gr-analog/python/analog/wfm_tx.py