69 files changed, 110 insertions, 204 deletions
diff --git a/gr-digital/python/CMakeLists.txt b/gr-digital/python/digital/CMakeLists.txt
index e73efb70f8..919509f434 100644
--- a/gr-digital/python/CMakeLists.txt
+++ b/gr-digital/python/digital/CMakeLists.txt
@@ -66,26 +66,17 @@ GR_PYTHON_INSTALL(
 ########################################################################
 if(ENABLE_TESTING)
 
-list(APPEND GR_TEST_PYTHON_DIRS
-    ${CMAKE_BINARY_DIR}/gr-digital/python
-    ${CMAKE_BINARY_DIR}/gr-digital/swig
-    ${CMAKE_BINARY_DIR}/gr-filter/python
-    ${CMAKE_BINARY_DIR}/gr-filter/swig
-    ${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-fft/python
-    ${CMAKE_BINARY_DIR}/gr-fft/swig
-    ${CMAKE_BINARY_DIR}/gr-channels/python
-    ${CMAKE_BINARY_DIR}/gr-channels/swig
-)
-list(APPEND GR_TEST_TARGET_DEPS gnuradio-digital gnuradio-filter gnuradio-fft gnuradio-analog 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-digital/python/__init__.py b/gr-digital/python/digital/__init__.py
index 6bbe8160e8..5059e4eec8 100644
--- a/gr-digital/python/__init__.py
+++ b/gr-digital/python/digital/__init__.py
@@ -24,7 +24,14 @@ Blocks and utilities for digital modulation and demodulation.
 
 # The presence of this file turns this directory into a Python package
 
-from digital_swig import *
+import os
+
+try:
+    from digital_swig import *
+except ImportError:
+    dirname, filename = os.path.split(os.path.abspath(__file__))
+    __path__.append(os.path.join(dirname, "..", "..", "swig"))
+    from digital_swig import *
 from psk import *
 from qam import *
 from qamlike import *
diff --git a/gr-digital/python/bpsk.py b/gr-digital/python/digital/bpsk.py
index 57cf2534f4..57cf2534f4 100644
--- a/gr-digital/python/bpsk.py
+++ b/gr-digital/python/digital/bpsk.py
diff --git a/gr-digital/python/cpm.py b/gr-digital/python/digital/cpm.py
index b27fb098f5..b27fb098f5 100644
--- a/gr-digital/python/cpm.py
+++ b/gr-digital/python/digital/cpm.py
diff --git a/gr-digital/python/crc.py b/gr-digital/python/digital/crc.py
index e228faaa98..e228faaa98 100644
--- a/gr-digital/python/crc.py
+++ b/gr-digital/python/digital/crc.py
diff --git a/gr-digital/python/digital_voice.py.real b/gr-digital/python/digital/digital_voice.py.real
index 241a4a3dc2..241a4a3dc2 100644
--- a/gr-digital/python/digital_voice.py.real
+++ b/gr-digital/python/digital/digital_voice.py.real
diff --git a/gr-digital/python/generic_mod_demod.py b/gr-digital/python/digital/generic_mod_demod.py
index b812fe1c37..b812fe1c37 100644
--- a/gr-digital/python/generic_mod_demod.py
+++ b/gr-digital/python/digital/generic_mod_demod.py
diff --git a/gr-digital/python/gfsk.py b/gr-digital/python/digital/gfsk.py
index 6ba007ca0f..6ba007ca0f 100644
--- a/gr-digital/python/gfsk.py
+++ b/gr-digital/python/digital/gfsk.py
diff --git a/gr-digital/python/gmsk.py b/gr-digital/python/digital/gmsk.py
index 055fc6002b..9a44837002 100644
--- a/gr-digital/python/gmsk.py
+++ b/gr-digital/python/digital/gmsk.py
@@ -24,21 +24,15 @@
 
 # See gnuradio-examples/python/digital for examples
 
-from gnuradio import gr
-from gnuradio import blocks
-from gnuradio import analog
-import modulation_utils
-import digital_swig as digital
 from math import pi
-import numpy
 from pprint import pprint
 import inspect
 
-try:
-    from gnuradio import filter
-except ImportError:
-    import filter_swig as filter
+import numpy
 
+from gnuradio import gr, blocks, analog, filter
+import modulation_utils
+import digital_swig as digital
 
 # default values (used in __init__ and add_options)
 _def_samples_per_symbol = 2
diff --git a/gr-digital/python/modulation_utils.py b/gr-digital/python/digital/modulation_utils.py
index d499094d05..d499094d05 100644
--- a/gr-digital/python/modulation_utils.py
+++ b/gr-digital/python/digital/modulation_utils.py
diff --git a/gr-digital/python/ofdm.py b/gr-digital/python/digital/ofdm.py
index fdb23703f9..fdb23703f9 100644
--- a/gr-digital/python/ofdm.py
+++ b/gr-digital/python/digital/ofdm.py
diff --git a/gr-digital/python/ofdm_packet_utils.py b/gr-digital/python/digital/ofdm_packet_utils.py
index c49dfe4f8e..c49dfe4f8e 100644
--- a/gr-digital/python/ofdm_packet_utils.py
+++ b/gr-digital/python/digital/ofdm_packet_utils.py
diff --git a/gr-digital/python/ofdm_receiver.py b/gr-digital/python/digital/ofdm_receiver.py
index 4fbf76251a..4fbf76251a 100644
--- a/gr-digital/python/ofdm_receiver.py
+++ b/gr-digital/python/digital/ofdm_receiver.py
diff --git a/gr-digital/python/ofdm_sync_fixed.py b/gr-digital/python/digital/ofdm_sync_fixed.py
index 9cbd59b943..9cbd59b943 100644
--- a/gr-digital/python/ofdm_sync_fixed.py
+++ b/gr-digital/python/digital/ofdm_sync_fixed.py
diff --git a/gr-digital/python/ofdm_sync_ml.py b/gr-digital/python/digital/ofdm_sync_ml.py
index 3afd647098..3afd647098 100644
--- a/gr-digital/python/ofdm_sync_ml.py
+++ b/gr-digital/python/digital/ofdm_sync_ml.py
diff --git a/gr-digital/python/ofdm_sync_pn.py b/gr-digital/python/digital/ofdm_sync_pn.py
index 4c6a30f802..4c6a30f802 100644
--- a/gr-digital/python/ofdm_sync_pn.py
+++ b/gr-digital/python/digital/ofdm_sync_pn.py
diff --git a/gr-digital/python/ofdm_sync_pnac.py b/gr-digital/python/digital/ofdm_sync_pnac.py
index ee7c82927a..ee7c82927a 100644
--- a/gr-digital/python/ofdm_sync_pnac.py
+++ b/gr-digital/python/digital/ofdm_sync_pnac.py
diff --git a/gr-digital/python/ofdm_txrx.py b/gr-digital/python/digital/ofdm_txrx.py
index 8f1b4c5f02..8f1b4c5f02 100644
--- a/gr-digital/python/ofdm_txrx.py
+++ b/gr-digital/python/digital/ofdm_txrx.py
diff --git a/gr-digital/python/packet_utils.py b/gr-digital/python/digital/packet_utils.py
index 2929758ef0..2929758ef0 100644
--- a/gr-digital/python/packet_utils.py
+++ b/gr-digital/python/digital/packet_utils.py
diff --git a/gr-digital/python/pkt.py b/gr-digital/python/digital/pkt.py
index 434548906e..434548906e 100644
--- a/gr-digital/python/pkt.py
+++ b/gr-digital/python/digital/pkt.py
diff --git a/gr-digital/python/psk.py b/gr-digital/python/digital/psk.py
index 1816ffb4ba..1816ffb4ba 100644
--- a/gr-digital/python/psk.py
+++ b/gr-digital/python/digital/psk.py
diff --git a/gr-digital/python/qa_binary_slicer_fb.py b/gr-digital/python/digital/qa_binary_slicer_fb.py
index 40213d7e33..93e12dbb8d 100755
--- a/gr-digital/python/qa_binary_slicer_fb.py
+++ b/gr-digital/python/digital/qa_binary_slicer_fb.py
@@ -20,10 +20,9 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gr_unittest
-import digital_swig as digital
-import blocks_swig as blocks
-import math, random
+import random
+
+from gnuradio import gr, gr_unittest, digital, blocks
 
 class test_binary_slicer_fb(gr_unittest.TestCase):
 
diff --git a/gr-digital/python/qa_chunks_to_symbols.py b/gr-digital/python/digital/qa_chunks_to_symbols.py
index cbc29b83a9..25798f33e5 100755
--- a/gr-digital/python/qa_chunks_to_symbols.py
+++ b/gr-digital/python/digital/qa_chunks_to_symbols.py
@@ -20,9 +20,7 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr, gr_unittest
-import digital_swig as digital
-import blocks_swig as blocks
+from gnuradio import gr, gr_unittest, digital, blocks
 
 class test_chunks_to_symbols(gr_unittest.TestCase):
 
diff --git a/gr-digital/python/qa_clock_recovery_mm.py b/gr-digital/python/digital/qa_clock_recovery_mm.py
index f696c9f124..783770d6e9 100755
--- a/gr-digital/python/qa_clock_recovery_mm.py
+++ b/gr-digital/python/digital/qa_clock_recovery_mm.py
@@ -20,10 +20,10 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gr_unittest
-import digital_swig as digital
-import blocks_swig as blocks
-import random, cmath
+import random
+import cmath
+
+from gnuradio import gr, gr_unittest, digital, blocks
 
 class test_clock_recovery_mm(gr_unittest.TestCase):
 
diff --git a/gr-digital/python/qa_cma_equalizer.py b/gr-digital/python/digital/qa_cma_equalizer.py
index 183ba4f4e7..6da391f70c 100755
--- a/gr-digital/python/qa_cma_equalizer.py
+++ b/gr-digital/python/digital/qa_cma_equalizer.py
@@ -20,9 +20,7 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gr_unittest
-import digital_swig as digital
-import blocks_swig as blocks
+from gnuradio import gr, gr_unittest, digital, blocks
 
 class test_cma_equalizer_fir(gr_unittest.TestCase):
 
diff --git a/gr-digital/python/qa_constellation.py b/gr-digital/python/digital/qa_constellation.py
index 77fb88031c..9e7e691d5c 100755
--- a/gr-digital/python/qa_constellation.py
+++ b/gr-digital/python/digital/qa_constellation.py
@@ -23,15 +23,9 @@
 import random
 from cmath import exp, pi, log
 
-from gnuradio import gr, gr_unittest
-from utils import mod_codes
-import digital_swig as digital
-import blocks_swig as blocks
-
-# import from local folder
-import psk
-import qam
-import qamlike
+from gnuradio import gr, gr_unittest, digital, blocks
+from gnuradio.digital.utils import mod_codes
+from gnuradio.digital import psk, qam, qamlike
 
 tested_mod_codes = (mod_codes.NO_CODE, mod_codes.GRAY_CODE)
 
diff --git a/gr-digital/python/qa_constellation_decoder_cb.py b/gr-digital/python/digital/qa_constellation_decoder_cb.py
index 12fef4345f..d3fbce91ba 100755
--- a/gr-digital/python/qa_constellation_decoder_cb.py
+++ b/gr-digital/python/digital/qa_constellation_decoder_cb.py
@@ -20,10 +20,7 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gr_unittest
-import digital_swig as digital
-import blocks_swig as blocks
-import math
+from gnuradio import gr, gr_unittest, digital, blocks
 
 class test_constellation_decoder(gr_unittest.TestCase):
 
diff --git a/gr-digital/python/qa_constellation_receiver.py b/gr-digital/python/digital/qa_constellation_receiver.py
index 73a78d0f8e..e595b585ac 100755
--- a/gr-digital/python/qa_constellation_receiver.py
+++ b/gr-digital/python/digital/qa_constellation_receiver.py
@@ -21,19 +21,15 @@
 # 
 
 import random
+import math
 
-from gnuradio import gr, gr_unittest
-from utils import mod_codes, alignment
-import packet_utils
-import filter_swig as filter
-import analog_swig as analog
-import blocks_swig as blocks
-from generic_mod_demod import generic_mod, generic_demod
+from gnuradio import gr, gr_unittest, filter, analog, blocks, digital
+from gnuradio.digital.utils import mod_codes, alignment
+from gnuradio.digital import packet_utils
+from gnuradio.digital.generic_mod_demod import generic_mod, generic_demod
 
 from qa_constellation import tested_constellations, twod_constell
 
-import math
-
 # Set a seed so that if errors turn up they are reproducible.
 SEED = 1239
 
diff --git a/gr-digital/python/qa_correlate_access_code.py b/gr-digital/python/digital/qa_correlate_access_code.py
index ccddc0f113..198a254da7 100755
--- a/gr-digital/python/qa_correlate_access_code.py
+++ b/gr-digital/python/digital/qa_correlate_access_code.py
@@ -20,10 +20,7 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gr_unittest
-import digital_swig as digital
-import blocks_swig as blocks
-import math
+from gnuradio import gr, gr_unittest, digital, blocks
 
 default_access_code = '\xAC\xDD\xA4\xE2\xF2\x8C\x20\xFC'
 
diff --git a/gr-digital/python/qa_costas_loop_cc.py b/gr-digital/python/digital/qa_costas_loop_cc.py
index 9be96101e3..9ecb017599 100755
--- a/gr-digital/python/qa_costas_loop_cc.py
+++ b/gr-digital/python/digital/qa_costas_loop_cc.py
@@ -20,11 +20,11 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gr_unittest
-import digital_swig as digital
-import blocks_swig as blocks
-import psk
-import random, cmath
+import random
+import cmath
+
+from gnuradio import gr, gr_unittest, digital, blocks
+from gnuradio.digital import psk
 
 class test_costas_loop_cc(gr_unittest.TestCase):
 
diff --git a/gr-digital/python/qa_cpm.py b/gr-digital/python/digital/qa_cpm.py
index c87f7c34d6..6468ed507b 100755
--- a/gr-digital/python/qa_cpm.py
+++ b/gr-digital/python/digital/qa_cpm.py
@@ -20,12 +20,10 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gr_unittest
-import digital_swig as digital
-import analog_swig as analog
-import blocks_swig as blocks
 import numpy
 
+from gnuradio import gr, gr_unittest, digital, analog, blocks
+
 class test_cpm(gr_unittest.TestCase):
 
     def setUp(self):
diff --git a/gr-digital/python/qa_crc32.py b/gr-digital/python/digital/qa_crc32.py
index cd4006b1d3..9252825ad6 100755
--- a/gr-digital/python/qa_crc32.py
+++ b/gr-digital/python/digital/qa_crc32.py
@@ -20,9 +20,10 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gr_unittest
-import digital_swig as digital
-import random, cmath
+import random
+import cmath
+
+from gnuradio import gr, gr_unittest, digital
 
 class test_crc32(gr_unittest.TestCase):
 
diff --git a/gr-digital/python/qa_crc32_bb.py b/gr-digital/python/digital/qa_crc32_bb.py
index 4991f49e14..167470d420 100755
--- a/gr-digital/python/qa_crc32_bb.py
+++ b/gr-digital/python/digital/qa_crc32_bb.py
@@ -19,9 +19,7 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gr_unittest
-import blocks_swig as blocks
-import digital_swig as digital
+from gnuradio import gr, gr_unittest, blocks, digital
 import pmt
 
 class qa_crc32_bb (gr_unittest.TestCase):
diff --git a/gr-digital/python/qa_diff_encoder.py b/gr-digital/python/digital/qa_diff_encoder.py
index 06efdf7189..410b937fbc 100755
--- a/gr-digital/python/qa_diff_encoder.py
+++ b/gr-digital/python/digital/qa_diff_encoder.py
@@ -20,12 +20,10 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr, gr_unittest
-import digital_swig as digital
-import blocks_swig as blocks
-import math
 import random
 
+from gnuradio import gr, gr_unittest, digital, blocks
+
 def make_random_int_tuple(L, min, max):
     result = []
     for x in range(L):
diff --git a/gr-digital/python/qa_diff_phasor_cc.py b/gr-digital/python/digital/qa_diff_phasor_cc.py
index 87ff59a2c4..7cae4870cc 100755
--- a/gr-digital/python/qa_diff_phasor_cc.py
+++ b/gr-digital/python/digital/qa_diff_phasor_cc.py
@@ -20,10 +20,7 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr, gr_unittest
-import digital_swig as digital
-import blocks_swig as blocks
-import math
+from gnuradio import gr, gr_unittest, digital, blocks
 
 class test_diff_phasor(gr_unittest.TestCase):
 
diff --git a/gr-digital/python/qa_digital.py b/gr-digital/python/digital/qa_digital.py
index 6f54f14208..63a167dece 100755
--- a/gr-digital/python/qa_digital.py
+++ b/gr-digital/python/digital/qa_digital.py
@@ -20,8 +20,7 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gr_unittest
-import digital_swig as digital
+from gnuradio import gr, gr_unittest, digital
 
 class test_digital(gr_unittest.TestCase):
 
diff --git a/gr-digital/python/qa_fll_band_edge.py b/gr-digital/python/digital/qa_fll_band_edge.py
index 050bf888d5..17c5fa85f8 100755
--- a/gr-digital/python/qa_fll_band_edge.py
+++ b/gr-digital/python/digital/qa_fll_band_edge.py
@@ -20,12 +20,10 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gr_unittest
-import digital_swig as digital
-import filter_swig as filter
-import blocks_swig as blocks
-import analog_swig as analog
-import random, math
+import random
+import math
+
+from gnuradio import gr, gr_unittest, digital, filter, blocks, analog
 
 class test_fll_band_edge_cc(gr_unittest.TestCase):
 
diff --git a/gr-digital/python/qa_framer_sink.py b/gr-digital/python/digital/qa_framer_sink.py
index bf6c5cc96d..4b260c14ec 100755
--- a/gr-digital/python/qa_framer_sink.py
+++ b/gr-digital/python/digital/qa_framer_sink.py
@@ -20,9 +20,7 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gr_unittest
-import digital_swig as digital
-import blocks_swig as blocks
+from gnuradio import gr, gr_unittest, digital, blocks
 
 default_access_code = '\xAC\xDD\xA4\xE2\xF2\x8C\x20\xFC'
 
diff --git a/gr-digital/python/qa_glfsr_source.py b/gr-digital/python/digital/qa_glfsr_source.py
index 227801c07e..f39c408198 100755
--- a/gr-digital/python/qa_glfsr_source.py
+++ b/gr-digital/python/digital/qa_glfsr_source.py
@@ -20,9 +20,7 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr, gr_unittest
-import digital_swig as digital
-import blocks_swig as blocks
+from gnuradio import gr, gr_unittest, digital, blocks
 
 class test_glfsr_source(gr_unittest.TestCase):
 
diff --git a/gr-digital/python/qa_header_payload_demux.py b/gr-digital/python/digital/qa_header_payload_demux.py
index 222b457021..e0ade4e5fa 100755
--- a/gr-digital/python/qa_header_payload_demux.py
+++ b/gr-digital/python/digital/qa_header_payload_demux.py
@@ -19,12 +19,11 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gr_unittest
-import pmt
-import digital_swig as digital
-import blocks_swig as blocks
 import time
 
+from gnuradio import gr, gr_unittest, digital, blocks
+import pmt
+
 class qa_header_payload_demux (gr_unittest.TestCase):
 
     def setUp (self):
diff --git a/gr-digital/python/qa_lfsr.py b/gr-digital/python/digital/qa_lfsr.py
index d70c466ca7..8b8872ab3b 100755
--- a/gr-digital/python/qa_lfsr.py
+++ b/gr-digital/python/digital/qa_lfsr.py
@@ -20,10 +20,9 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr, gr_unittest
-import digital_swig as digital
 import math
 
+from gnuradio import gr, gr_unittest, digital
 
 class test_lfsr(gr_unittest.TestCase):
 
diff --git a/gr-digital/python/qa_lms_equalizer.py b/gr-digital/python/digital/qa_lms_equalizer.py
index 749cce2075..7768c1f078 100755
--- a/gr-digital/python/qa_lms_equalizer.py
+++ b/gr-digital/python/digital/qa_lms_equalizer.py
@@ -20,9 +20,7 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gr_unittest
-import digital_swig as digital
-import blocks_swig as blocks
+from gnuradio import gr, gr_unittest, digital, blocks
 
 class test_lms_dd_equalizer(gr_unittest.TestCase):
 
diff --git a/gr-digital/python/qa_map.py b/gr-digital/python/digital/qa_map.py
index 2083d4a849..604fa084d9 100755
--- a/gr-digital/python/qa_map.py
+++ b/gr-digital/python/digital/qa_map.py
@@ -20,9 +20,7 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gr_unittest
-import digital_swig as digital
-import blocks_swig as blocks
+from gnuradio import gr, gr_unittest, digital, blocks
 
 class test_map(gr_unittest.TestCase):
 
diff --git a/gr-digital/python/qa_mpsk_receiver.py b/gr-digital/python/digital/qa_mpsk_receiver.py
index 9590df1f72..1379b52e61 100755
--- a/gr-digital/python/qa_mpsk_receiver.py
+++ b/gr-digital/python/digital/qa_mpsk_receiver.py
@@ -20,11 +20,11 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gr_unittest
-import digital_swig as digital
-import filter_swig as filter
-import blocks_swig as blocks
-import random, cmath, time
+import random
+import cmath
+import time
+
+from gnuradio import gr, gr_unittest, digital, filter, blocks
 
 class test_mpsk_receiver(gr_unittest.TestCase):
 
diff --git a/gr-digital/python/qa_mpsk_snr_est.py b/gr-digital/python/digital/qa_mpsk_snr_est.py
index ac8af4374e..032edf1c73 100755
--- a/gr-digital/python/qa_mpsk_snr_est.py
+++ b/gr-digital/python/digital/qa_mpsk_snr_est.py
@@ -19,11 +19,9 @@
 # the Free Software Foundation, Inc., 51 Franklin Street,
 # Boston, MA 02110-1301, USA.
 # 
+import random
 
-from gnuradio import gr, gr_unittest
-import digital_swig as digital
-import blocks_swig as blocks
-import math, random
+from gnuradio import gr, gr_unittest, digital, blocks
 
 def get_cplx():
     return complex(2*random.randint(0,1) - 1, 0)
diff --git a/gr-digital/python/qa_ofdm_carrier_allocator_cvc.py b/gr-digital/python/digital/qa_ofdm_carrier_allocator_cvc.py
index c0c9929646..5c95e6e335 100755
--- a/gr-digital/python/qa_ofdm_carrier_allocator_cvc.py
+++ b/gr-digital/python/digital/qa_ofdm_carrier_allocator_cvc.py
@@ -19,10 +19,8 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gr_unittest
+from gnuradio import gr, gr_unittest, digital, blocks
 import pmt
-import digital_swig as digital
-import blocks_swig as blocks
 
 class qa_digital_carrier_allocator_cvc (gr_unittest.TestCase):
 
diff --git a/gr-digital/python/qa_ofdm_chanest_vcvc.py b/gr-digital/python/digital/qa_ofdm_chanest_vcvc.py
index ae11c0534c..e6b331b2a8 100755
--- a/gr-digital/python/qa_ofdm_chanest_vcvc.py
+++ b/gr-digital/python/digital/qa_ofdm_chanest_vcvc.py
@@ -22,13 +22,11 @@
 import sys
 import numpy
 import random
-from gnuradio import gr, gr_unittest
+
+import numpy
+
+from gnuradio import gr, gr_unittest, blocks, analog, digital
 import pmt
-import blocks_swig as blocks
-import analog_swig as analog
-import digital_swig as digital
-import blocks_swig as blocks
-from ofdm_txrx import ofdm_tx
 
 def shift_tuple(vec, N):
     """ Shifts a vector by N elements. Fills up with zeros. """
diff --git a/gr-digital/python/qa_ofdm_cyclic_prefixer.py b/gr-digital/python/digital/qa_ofdm_cyclic_prefixer.py
index 69091d8d00..5cb9fae777 100755
--- a/gr-digital/python/qa_ofdm_cyclic_prefixer.py
+++ b/gr-digital/python/digital/qa_ofdm_cyclic_prefixer.py
@@ -20,10 +20,8 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gr_unittest
+from gnuradio import gr, gr_unittest, digital, blocks
 import pmt
-import digital_swig as digital
-import blocks_swig as blocks
 
 class test_ofdm_cyclic_prefixer (gr_unittest.TestCase):
 
diff --git a/gr-digital/python/qa_ofdm_frame_equalizer_vcvc.py b/gr-digital/python/digital/qa_ofdm_frame_equalizer_vcvc.py
index 0c79125669..1cdb8ed9a4 100755
--- a/gr-digital/python/qa_ofdm_frame_equalizer_vcvc.py
+++ b/gr-digital/python/digital/qa_ofdm_frame_equalizer_vcvc.py
@@ -20,10 +20,9 @@
 # 
 
 import numpy
-from gnuradio import gr, gr_unittest
+
+from gnuradio import gr, gr_unittest, digital, blocks
 import pmt
-import digital_swig as digital
-import blocks_swig as blocks
 
 class qa_ofdm_frame_equalizer_vcvc (gr_unittest.TestCase):
 
diff --git a/gr-digital/python/qa_ofdm_insert_preamble.py b/gr-digital/python/digital/qa_ofdm_insert_preamble.py
index ec7ace8905..4edd54c8c6 100755
--- a/gr-digital/python/qa_ofdm_insert_preamble.py
+++ b/gr-digital/python/digital/qa_ofdm_insert_preamble.py
@@ -20,10 +20,9 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gr_unittest
 from pprint import pprint
-import digital_swig as digital
-import blocks_swig as blocks
+
+from gnuradio import gr, gr_unittest, digital, blocks
 
 class test_ofdm_insert_preamble(gr_unittest.TestCase):
 
diff --git a/gr-digital/python/qa_ofdm_serializer_vcc.py b/gr-digital/python/digital/qa_ofdm_serializer_vcc.py
index c53b4e4955..fbef2b1f27 100755
--- a/gr-digital/python/qa_ofdm_serializer_vcc.py
+++ b/gr-digital/python/digital/qa_ofdm_serializer_vcc.py
@@ -21,12 +21,9 @@
 # 
 
 import numpy
-from gnuradio import gr, gr_unittest
+
+from gnuradio import gr, gr_unittest, blocks, fft, analog, digital
 import pmt
-import blocks_swig as blocks
-import fft_swig as fft
-import analog_swig as analog
-import digital_swig as digital
 
 class qa_ofdm_serializer_vcc (gr_unittest.TestCase):
 
diff --git a/gr-digital/python/qa_ofdm_sync_sc_cfb.py b/gr-digital/python/digital/qa_ofdm_sync_sc_cfb.py
index 3a9bdb5d14..ccb6dff439 100755
--- a/gr-digital/python/qa_ofdm_sync_sc_cfb.py
+++ b/gr-digital/python/digital/qa_ofdm_sync_sc_cfb.py
@@ -23,22 +23,10 @@
 import numpy
 import random
 
-from gnuradio import gr, gr_unittest
-import blocks_swig as blocks
-import analog_swig as analog
-import channels_swig as channels
-
-try:
-    # This will work when feature #505 is added.
-    from gnuradio import digital
-    from gnuradio.digital.utils import tagged_streams
-    from gnuradio.digital.ofdm_txrx import ofdm_tx
-except ImportError:
-    # Until then this will work.
-    import digital_swig as digital
-    from utils import tagged_streams
-    from ofdm_txrx import ofdm_tx
-
+from gnuradio import gr, gr_unittest, blocks, analog, channels
+from gnuradio import digital
+from gnuradio.digital.utils import tagged_streams
+from gnuradio.digital.ofdm_txrx import ofdm_tx
 
 class qa_ofdm_sync_sc_cfb (gr_unittest.TestCase):
 
diff --git a/gr-digital/python/qa_ofdm_txrx.py b/gr-digital/python/digital/qa_ofdm_txrx.py
index 568ae0d40a..adf93ee356 100755
--- a/gr-digital/python/qa_ofdm_txrx.py
+++ b/gr-digital/python/digital/qa_ofdm_txrx.py
@@ -20,15 +20,12 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-import numpy
-import scipy
 import random
-from gnuradio import gr, gr_unittest
-import blocks_swig as blocks
-import digital_swig as digital
-import channels_swig as channels
-from ofdm_txrx import ofdm_tx, ofdm_rx
-from utils import  tagged_streams
+import numpy
+
+from gnuradio import gr, gr_unittest, digital, blocks, channels
+from gnuradio.digital.ofdm_txrx import ofdm_tx, ofdm_rx
+from gnuradio.digital.utils import tagged_streams
 
 # Set this to true if you need to write out data
 LOG_DEBUG_INFO=False
diff --git a/gr-digital/python/qa_packet_headergenerator_bb.py b/gr-digital/python/digital/qa_packet_headergenerator_bb.py
index 0471385afd..3697bd1eb7 100755
--- a/gr-digital/python/qa_packet_headergenerator_bb.py
+++ b/gr-digital/python/digital/qa_packet_headergenerator_bb.py
@@ -19,9 +19,7 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gr_unittest
-import digital_swig as digital
-import blocks_swig as blocks
+from gnuradio import gr, gr_unittest, digital, blocks
 import pmt
 
 class qa_packet_headergenerator_bb (gr_unittest.TestCase):
diff --git a/gr-digital/python/qa_packet_headerparser_b.py b/gr-digital/python/digital/qa_packet_headerparser_b.py
index cf8e1e932e..2dca3637e3 100755
--- a/gr-digital/python/qa_packet_headerparser_b.py
+++ b/gr-digital/python/digital/qa_packet_headerparser_b.py
@@ -21,11 +21,10 @@
 
 import time
 import random
-from gnuradio import gr, gr_unittest
+
+from gnuradio import gr, gr_unittest, blocks, digital
+from gnuradio.digital import tagged_streams
 import pmt
-import blocks_swig as blocks
-import digital_swig as digital
-from utils import tagged_streams
 
 class qa_packet_headerparser_b (gr_unittest.TestCase):
 
diff --git a/gr-digital/python/qa_pfb_clock_sync.py b/gr-digital/python/digital/qa_pfb_clock_sync.py
index 3db1fd5581..286953ab34 100755
--- a/gr-digital/python/qa_pfb_clock_sync.py
+++ b/gr-digital/python/digital/qa_pfb_clock_sync.py
@@ -20,11 +20,10 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gr_unittest
-import filter_swig as filter
-import digital_swig as digital
-import blocks_swig as blocks
-import random, cmath
+import random
+import cmath
+
+from gnuradio import gr, gr_unittest, filter, digital, blocks
 
 class test_pfb_clock_sync(gr_unittest.TestCase):
 
diff --git a/gr-digital/python/qa_pn_correlator_cc.py b/gr-digital/python/digital/qa_pn_correlator_cc.py
index 14d6bcfbe1..92041d9eda 100755
--- a/gr-digital/python/qa_pn_correlator_cc.py
+++ b/gr-digital/python/digital/qa_pn_correlator_cc.py
@@ -20,9 +20,7 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr, gr_unittest
-import digital_swig as digital
-import blocks_swig as blocks
+from gnuradio import gr, gr_unittest, digital, blocks
 
 class test_pn_correlator_cc(gr_unittest.TestCase):
 
diff --git a/gr-digital/python/qa_probe_density.py b/gr-digital/python/digital/qa_probe_density.py
index 45d651ec1c..752d95da3e 100755
--- a/gr-digital/python/qa_probe_density.py
+++ b/gr-digital/python/digital/qa_probe_density.py
@@ -20,9 +20,7 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gr_unittest
-import digital_swig as digital
-import blocks_swig as blocks
+from gnuradio import gr, gr_unittest, digital, blocks
 
 class test_probe_density(gr_unittest.TestCase):
 
diff --git a/gr-digital/python/qa_scrambler.py b/gr-digital/python/digital/qa_scrambler.py
index b4980e7816..05daebd389 100755
--- a/gr-digital/python/qa_scrambler.py
+++ b/gr-digital/python/digital/qa_scrambler.py
@@ -20,9 +20,7 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr, gr_unittest
-import digital_swig as digital
-import blocks_swig as blocks
+from gnuradio import gr, gr_unittest, digital, blocks
 
 class test_scrambler(gr_unittest.TestCase):
 
diff --git a/gr-digital/python/qa_simple_correlator.py b/gr-digital/python/digital/qa_simple_correlator.py
index 57312ff0dd..f39fb62dda 100755
--- a/gr-digital/python/qa_simple_correlator.py
+++ b/gr-digital/python/digital/qa_simple_correlator.py
@@ -20,10 +20,7 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr, gr_unittest
-import blocks_swig as blocks
-import filter_swig as filter
-import digital_swig as digital
+from gnuradio import gr, gr_unittest, blocks, filter, digital
 
 class test_simple_correlator(gr_unittest.TestCase):
 
diff --git a/gr-digital/python/qa_simple_framer.py b/gr-digital/python/digital/qa_simple_framer.py
index f598b393f2..cf9934648b 100755
--- a/gr-digital/python/qa_simple_framer.py
+++ b/gr-digital/python/digital/qa_simple_framer.py
@@ -20,10 +20,7 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr, gr_unittest
-import digital_swig as digital
-import blocks_swig as blocks
-import math
+from gnuradio import gr, gr_unittest, digital, blocks
 
 class test_simple_framer(gr_unittest.TestCase):
 
diff --git a/gr-digital/python/qam.py b/gr-digital/python/digital/qam.py
index 518be78941..518be78941 100644
--- a/gr-digital/python/qam.py
+++ b/gr-digital/python/digital/qam.py
diff --git a/gr-digital/python/qamlike.py b/gr-digital/python/digital/qamlike.py
index 2f8c855339..2f8c855339 100644
--- a/gr-digital/python/qamlike.py
+++ b/gr-digital/python/digital/qamlike.py
diff --git a/gr-digital/python/qpsk.py b/gr-digital/python/digital/qpsk.py
index 859d981367..859d981367 100644
--- a/gr-digital/python/qpsk.py
+++ b/gr-digital/python/digital/qpsk.py
diff --git a/gr-digital/python/utils/__init__.py b/gr-digital/python/digital/utils/__init__.py
index b3e997f9f8..b3e997f9f8 100644
--- a/gr-digital/python/utils/__init__.py
+++ b/gr-digital/python/digital/utils/__init__.py
diff --git a/gr-digital/python/utils/alignment.py b/gr-digital/python/digital/utils/alignment.py
index f3ad3781e2..f3ad3781e2 100644
--- a/gr-digital/python/utils/alignment.py
+++ b/gr-digital/python/digital/utils/alignment.py
diff --git a/gr-digital/python/utils/gray_code.py b/gr-digital/python/digital/utils/gray_code.py
index 926a1ded10..926a1ded10 100644
--- a/gr-digital/python/utils/gray_code.py
+++ b/gr-digital/python/digital/utils/gray_code.py
diff --git a/gr-digital/python/utils/mod_codes.py b/gr-digital/python/digital/utils/mod_codes.py
index f55fe41b8b..f55fe41b8b 100644
--- a/gr-digital/python/utils/mod_codes.py
+++ b/gr-digital/python/digital/utils/mod_codes.py
diff --git a/gr-digital/python/utils/tagged_streams.py b/gr-digital/python/digital/utils/tagged_streams.py
index c7edbf61eb..c7edbf61eb 100644
--- a/gr-digital/python/utils/tagged_streams.py
+++ b/gr-digital/python/digital/utils/tagged_streams.py