12 files changed, 29 insertions, 54 deletions
diff --git a/gr-vocoder/CMakeLists.txt b/gr-vocoder/CMakeLists.txt
index 03f77376a9..59f0631869 100644
--- a/gr-vocoder/CMakeLists.txt
+++ b/gr-vocoder/CMakeLists.txt
@@ -96,7 +96,7 @@ add_subdirectory(lib)
 add_subdirectory(doc)
 if(ENABLE_PYTHON)
     add_subdirectory(swig)
-    add_subdirectory(python)
+    add_subdirectory(python/vocoder)
     add_subdirectory(grc)
     add_subdirectory(examples)
 endif(ENABLE_PYTHON)
diff --git a/gr-vocoder/python/CMakeLists.txt b/gr-vocoder/python/vocoder/CMakeLists.txt
index 9fdc625280..689fddb178 100644
--- a/gr-vocoder/python/CMakeLists.txt
+++ b/gr-vocoder/python/vocoder/CMakeLists.txt
@@ -35,22 +35,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
-    ${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-vocoder/python
-    ${CMAKE_BINARY_DIR}/gr-vocoder/swig
-)
-list(APPEND GR_TEST_TARGET_DEPS gnuradio-vocoder)
+  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-vocoder/python/__init__.py b/gr-vocoder/python/vocoder/__init__.py
index ba5862f8d9..7b1b82f847 100644
--- a/gr-vocoder/python/__init__.py
+++ b/gr-vocoder/python/vocoder/__init__.py
@@ -23,6 +23,13 @@
 This is the gr-vocoder package. This package includes the various
 vocoder blocks in GNU Radio.
 '''
+import os
+
+try:
+    from vocoder_swig import *
+except ImportError:
+    dirname, filename = os.path.split(os.path.abspath(__file__))
+    __path__.append(os.path.join(dirname, "..", "..", "swig"))
+    from vocoder_swig import *
 
-from vocoder_swig import *
 from cvsd import *
diff --git a/gr-vocoder/python/cvsd.py b/gr-vocoder/python/vocoder/cvsd.py
index 1c58c33076..b6ce822935 100644
--- a/gr-vocoder/python/cvsd.py
+++ b/gr-vocoder/python/vocoder/cvsd.py
@@ -20,19 +20,9 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr
+from gnuradio import gr, filter, blocks
 import vocoder_swig
 
-try:
-    from gnuradio import filter
-except ImportError:
-    import filter_swig as filter
-
-try:
-    from gnuradio import blocks
-except ImportError:
-    import blocks_swig as blocks
-
 class cvsd_encode_fb(gr.hier_block2):
     '''
     This is a wrapper for the CVSD encoder that performs interpolation and filtering
diff --git a/gr-vocoder/python/qa_alaw_vocoder.py b/gr-vocoder/python/vocoder/qa_alaw_vocoder.py
index 50b5f8844a..3a49908e5a 100755
--- a/gr-vocoder/python/qa_alaw_vocoder.py
+++ b/gr-vocoder/python/vocoder/qa_alaw_vocoder.py
@@ -20,9 +20,7 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr, gr_unittest
-import vocoder_swig as vocoder
-import blocks_swig as blocks
+from gnuradio import gr, gr_unittest, vocoder, blocks
 
 class test_alaw_vocoder (gr_unittest.TestCase):
 
diff --git a/gr-vocoder/python/qa_codec2_vocoder.py b/gr-vocoder/python/vocoder/qa_codec2_vocoder.py
index 83dbc2eb87..b2ed734888 100755
--- a/gr-vocoder/python/qa_codec2_vocoder.py
+++ b/gr-vocoder/python/vocoder/qa_codec2_vocoder.py
@@ -20,9 +20,7 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr, gr_unittest
-import vocoder_swig as vocoder
-import blocks_swig as blocks
+from gnuradio import gr, gr_unittest, vocoder, blocks
 
 class test_codec2_vocoder (gr_unittest.TestCase):
 
diff --git a/gr-vocoder/python/qa_cvsd_vocoder.py b/gr-vocoder/python/vocoder/qa_cvsd_vocoder.py
index 548c877526..408c6b74c9 100755
--- a/gr-vocoder/python/qa_cvsd_vocoder.py
+++ b/gr-vocoder/python/vocoder/qa_cvsd_vocoder.py
@@ -20,11 +20,8 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr, gr_unittest
-import vocoder_swig as vocoder
-import cvsd
-import blocks_swig as blocks
-import filter_swig as filter
+from gnuradio import gr, gr_unittest, vocoder, blocks, filter
+from gnuradio.vocoder import cvsd
 
 class test_cvsd_vocoder (gr_unittest.TestCase):
 
diff --git a/gr-vocoder/python/qa_g721_vocoder.py b/gr-vocoder/python/vocoder/qa_g721_vocoder.py
index ed53771076..8808b8fede 100755
--- a/gr-vocoder/python/qa_g721_vocoder.py
+++ b/gr-vocoder/python/vocoder/qa_g721_vocoder.py
@@ -20,9 +20,7 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr, gr_unittest
-import vocoder_swig as vocoder
-import blocks_swig as blocks
+from gnuradio import gr, gr_unittest, vocoder, blocks
 
 class test_g721_vocoder (gr_unittest.TestCase):
 
diff --git a/gr-vocoder/python/qa_g723_24_vocoder.py b/gr-vocoder/python/vocoder/qa_g723_24_vocoder.py
index f473e85677..c587623e1d 100755
--- a/gr-vocoder/python/qa_g723_24_vocoder.py
+++ b/gr-vocoder/python/vocoder/qa_g723_24_vocoder.py
@@ -20,9 +20,7 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr, gr_unittest
-import vocoder_swig as vocoder
-import blocks_swig as blocks
+from gnuradio import gr, gr_unittest, vocoder, blocks
 
 class test_g723_24_vocoder (gr_unittest.TestCase):
 
diff --git a/gr-vocoder/python/qa_g723_40_vocoder.py b/gr-vocoder/python/vocoder/qa_g723_40_vocoder.py
index e7ca4587b7..689102237f 100755
--- a/gr-vocoder/python/qa_g723_40_vocoder.py
+++ b/gr-vocoder/python/vocoder/qa_g723_40_vocoder.py
@@ -20,9 +20,7 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr, gr_unittest
-import vocoder_swig as vocoder
-import blocks_swig as blocks
+from gnuradio import gr, gr_unittest, vocoder, blocks
 
 class test_g723_40_vocoder (gr_unittest.TestCase):
 
diff --git a/gr-vocoder/python/qa_gsm_full_rate.py b/gr-vocoder/python/vocoder/qa_gsm_full_rate.py
index a62781ea94..69ea94bbf9 100755
--- a/gr-vocoder/python/qa_gsm_full_rate.py
+++ b/gr-vocoder/python/vocoder/qa_gsm_full_rate.py
@@ -20,9 +20,7 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr, gr_unittest
-import vocoder_swig as vocoder
-import blocks_swig as blocks
+from gnuradio import gr, gr_unittest, vocoder, blocks
 
 class test_gsm_vocoder (gr_unittest.TestCase):
 
diff --git a/gr-vocoder/python/qa_ulaw_vocoder.py b/gr-vocoder/python/vocoder/qa_ulaw_vocoder.py
index a030e065cc..46c8d490a8 100755
--- a/gr-vocoder/python/qa_ulaw_vocoder.py
+++ b/gr-vocoder/python/vocoder/qa_ulaw_vocoder.py
@@ -20,9 +20,7 @@
 # Boston, MA 02110-1301, USA.
 #
 
-from gnuradio import gr, gr_unittest
-import vocoder_swig as vocoder
-import blocks_swig as blocks
+from gnuradio import gr, gr_unittest, vocoder, blocks
 
 class test_ulaw_vocoder (gr_unittest.TestCase):