53 files changed, 11 insertions, 4 deletions
diff --git a/gnuradio-core/src/python/gnuradio/__init__.py b/gnuradio-core/src/python/gnuradio/__init__.py
index 123050eb9a..0bc9f4a253 100644
--- a/gnuradio-core/src/python/gnuradio/__init__.py
+++ b/gnuradio-core/src/python/gnuradio/__init__.py
@@ -30,5 +30,6 @@ if path.endswith(path_ending):
     __path__.append(os.path.join(build_path, 'gr-utils', 'src', 'python'))
     __path__.append(os.path.join(build_path, 'gr-blocks', 'python'))
     __path__.append(os.path.join(build_path, 'gr-digital', 'python'))
+    __path__.append(os.path.join(build_path, 'gr-filter', 'python'))
     
 print(__path__)
diff --git a/gr-filter/CMakeLists.txt b/gr-filter/CMakeLists.txt
index adfb92b1c9..7ac8962968 100644
--- a/gr-filter/CMakeLists.txt
+++ b/gr-filter/CMakeLists.txt
@@ -96,9 +96,9 @@ add_subdirectory(include/filter)
 add_subdirectory(lib)
 if(ENABLE_PYTHON)
     add_subdirectory(swig)
-    add_subdirectory(python)
-    add_subdirectory(python/design)
-    add_subdirectory(python/gui)
+    add_subdirectory(python/filter)
+    add_subdirectory(python/filter/design)
+    add_subdirectory(python/filter/gui)
     add_subdirectory(grc)
     add_subdirectory(apps)
 endif(ENABLE_PYTHON)
diff --git a/gr-filter/python/CMakeLists.txt b/gr-filter/python/filter/CMakeLists.txt
index 1ef5b35641..1ef5b35641 100644
--- a/gr-filter/python/CMakeLists.txt
+++ b/gr-filter/python/filter/CMakeLists.txt
diff --git a/gr-filter/python/__init__.py b/gr-filter/python/filter/__init__.py
index ad2f116d72..28ce05df2d 100644
--- a/gr-filter/python/__init__.py
+++ b/gr-filter/python/filter/__init__.py
@@ -23,8 +23,14 @@
 This is the gr-filter package. This package provides GNU Radio
 processing blocks for FILTER and related functions.
 '''
+import os
 
-from filter_swig import *
+try:
+    from filter_swig import *
+except ImportError:
+    dirname, filename = os.path.split(os.path.abspath(__file__))
+    __path__.append(os.path.join(dirname, "..", "..", "swig"))
+    from filter_swig import *
 from filterbank import *
 from rational_resampler import *
 import pfb
diff --git a/gr-filter/python/design/CMakeLists.txt b/gr-filter/python/filter/design/CMakeLists.txt
index 21e47b86d6..21e47b86d6 100644
--- a/gr-filter/python/design/CMakeLists.txt
+++ b/gr-filter/python/filter/design/CMakeLists.txt
diff --git a/gr-filter/python/design/api_object.py b/gr-filter/python/filter/design/api_object.py
index 8e3687d37e..8e3687d37e 100644
--- a/gr-filter/python/design/api_object.py
+++ b/gr-filter/python/filter/design/api_object.py
diff --git a/gr-filter/python/design/filter_design.py b/gr-filter/python/filter/design/filter_design.py
index 748a435c63..748a435c63 100644
--- a/gr-filter/python/design/filter_design.py
+++ b/gr-filter/python/filter/design/filter_design.py
diff --git a/gr-filter/python/design/fir_design.py b/gr-filter/python/filter/design/fir_design.py
index 494cda3723..494cda3723 100644
--- a/gr-filter/python/design/fir_design.py
+++ b/gr-filter/python/filter/design/fir_design.py
diff --git a/gr-filter/python/filterbank.py b/gr-filter/python/filter/filterbank.py
index a8ee27ce97..a8ee27ce97 100644
--- a/gr-filter/python/filterbank.py
+++ b/gr-filter/python/filter/filterbank.py
diff --git a/gr-filter/python/gui/CMakeLists.txt b/gr-filter/python/filter/gui/CMakeLists.txt
index 6c9bbfa2f3..6c9bbfa2f3 100644
--- a/gr-filter/python/gui/CMakeLists.txt
+++ b/gr-filter/python/filter/gui/CMakeLists.txt
diff --git a/gr-filter/python/gui/bandgraphicsview.py b/gr-filter/python/filter/gui/bandgraphicsview.py
index 9e609fe2ac..9e609fe2ac 100644
--- a/gr-filter/python/gui/bandgraphicsview.py
+++ b/gr-filter/python/filter/gui/bandgraphicsview.py
diff --git a/gr-filter/python/gui/banditems.py b/gr-filter/python/filter/gui/banditems.py
index 9a6158fcfb..9a6158fcfb 100644
--- a/gr-filter/python/gui/banditems.py
+++ b/gr-filter/python/filter/gui/banditems.py
diff --git a/gr-filter/python/gui/icons.qrc b/gr-filter/python/filter/gui/icons.qrc
index 828d89d6aa..828d89d6aa 100644
--- a/gr-filter/python/gui/icons.qrc
+++ b/gr-filter/python/filter/gui/icons.qrc
diff --git a/gr-filter/python/gui/icons/add_pole.svg b/gr-filter/python/filter/gui/icons/add_pole.svg
index f5cf3370d7..f5cf3370d7 100644
--- a/gr-filter/python/gui/icons/add_pole.svg
+++ b/gr-filter/python/filter/gui/icons/add_pole.svg
diff --git a/gr-filter/python/gui/icons/add_zero.svg b/gr-filter/python/filter/gui/icons/add_zero.svg
index 34a435d667..34a435d667 100644
--- a/gr-filter/python/gui/icons/add_zero.svg
+++ b/gr-filter/python/filter/gui/icons/add_zero.svg
diff --git a/gr-filter/python/gui/icons/conjugate.svg b/gr-filter/python/filter/gui/icons/conjugate.svg
index f543d03987..f543d03987 100644
--- a/gr-filter/python/gui/icons/conjugate.svg
+++ b/gr-filter/python/filter/gui/icons/conjugate.svg
diff --git a/gr-filter/python/gui/icons/filtr_taps.svg b/gr-filter/python/filter/gui/icons/filtr_taps.svg
index 103b113c48..103b113c48 100644
--- a/gr-filter/python/gui/icons/filtr_taps.svg
+++ b/gr-filter/python/filter/gui/icons/filtr_taps.svg
diff --git a/gr-filter/python/gui/icons/group_delay.svg b/gr-filter/python/filter/gui/icons/group_delay.svg
index 21eb1727bb..21eb1727bb 100644
--- a/gr-filter/python/gui/icons/group_delay.svg
+++ b/gr-filter/python/filter/gui/icons/group_delay.svg
diff --git a/gr-filter/python/gui/icons/impulse.svg b/gr-filter/python/filter/gui/icons/impulse.svg
index 10e3718dd4..10e3718dd4 100644
--- a/gr-filter/python/gui/icons/impulse.svg
+++ b/gr-filter/python/filter/gui/icons/impulse.svg
diff --git a/gr-filter/python/gui/icons/impulse_response.svg b/gr-filter/python/filter/gui/icons/impulse_response.svg
index 28a84d02e4..28a84d02e4 100644
--- a/gr-filter/python/gui/icons/impulse_response.svg
+++ b/gr-filter/python/filter/gui/icons/impulse_response.svg
diff --git a/gr-filter/python/gui/icons/mag_response.svg b/gr-filter/python/filter/gui/icons/mag_response.svg
index 8aa2eeca08..8aa2eeca08 100644
--- a/gr-filter/python/gui/icons/mag_response.svg
+++ b/gr-filter/python/filter/gui/icons/mag_response.svg
diff --git a/gr-filter/python/gui/icons/overlay.svg b/gr-filter/python/filter/gui/icons/overlay.svg
index 64def7f5eb..64def7f5eb 100644
--- a/gr-filter/python/gui/icons/overlay.svg
+++ b/gr-filter/python/filter/gui/icons/overlay.svg
diff --git a/gr-filter/python/gui/icons/phase_delay.svg b/gr-filter/python/filter/gui/icons/phase_delay.svg
index fa89068338..fa89068338 100644
--- a/gr-filter/python/gui/icons/phase_delay.svg
+++ b/gr-filter/python/filter/gui/icons/phase_delay.svg
diff --git a/gr-filter/python/gui/icons/phase_response.svg b/gr-filter/python/filter/gui/icons/phase_response.svg
index e6a6c0e5b0..e6a6c0e5b0 100644
--- a/gr-filter/python/gui/icons/phase_response.svg
+++ b/gr-filter/python/filter/gui/icons/phase_response.svg
diff --git a/gr-filter/python/gui/icons/remove_red.svg b/gr-filter/python/filter/gui/icons/remove_red.svg
index d42cc71489..d42cc71489 100644
--- a/gr-filter/python/gui/icons/remove_red.svg
+++ b/gr-filter/python/filter/gui/icons/remove_red.svg
diff --git a/gr-filter/python/gui/icons/step_response.svg b/gr-filter/python/filter/gui/icons/step_response.svg
index 089b699dff..089b699dff 100644
--- a/gr-filter/python/gui/icons/step_response.svg
+++ b/gr-filter/python/filter/gui/icons/step_response.svg
diff --git a/gr-filter/python/gui/icons_rc.py b/gr-filter/python/filter/gui/icons_rc.py
index 0b20ecb612..0b20ecb612 100644
--- a/gr-filter/python/gui/icons_rc.py
+++ b/gr-filter/python/filter/gui/icons_rc.py
diff --git a/gr-filter/python/gui/idealbanditems.py b/gr-filter/python/filter/gui/idealbanditems.py
index b0c0497e38..b0c0497e38 100644
--- a/gr-filter/python/gui/idealbanditems.py
+++ b/gr-filter/python/filter/gui/idealbanditems.py
diff --git a/gr-filter/python/gui/polezero_plot.py b/gr-filter/python/filter/gui/polezero_plot.py
index 0115339e5e..0115339e5e 100644
--- a/gr-filter/python/gui/polezero_plot.py
+++ b/gr-filter/python/filter/gui/polezero_plot.py
diff --git a/gr-filter/python/gui/pyqt_filter_stacked.py b/gr-filter/python/filter/gui/pyqt_filter_stacked.py
index 98836180e7..98836180e7 100644
--- a/gr-filter/python/gui/pyqt_filter_stacked.py
+++ b/gr-filter/python/filter/gui/pyqt_filter_stacked.py
diff --git a/gr-filter/python/gui/pyqt_filter_stacked.ui b/gr-filter/python/filter/gui/pyqt_filter_stacked.ui
index 7aecf62508..7aecf62508 100644
--- a/gr-filter/python/gui/pyqt_filter_stacked.ui
+++ b/gr-filter/python/filter/gui/pyqt_filter_stacked.ui
diff --git a/gr-filter/python/optfir.py b/gr-filter/python/filter/optfir.py
index 47b0ac4e8d..47b0ac4e8d 100644
--- a/gr-filter/python/optfir.py
+++ b/gr-filter/python/filter/optfir.py
diff --git a/gr-filter/python/pfb.py b/gr-filter/python/filter/pfb.py
index 52f598cc40..52f598cc40 100644
--- a/gr-filter/python/pfb.py
+++ b/gr-filter/python/filter/pfb.py
diff --git a/gr-filter/python/qa_adaptive_fir_filter.py b/gr-filter/python/filter/qa_adaptive_fir_filter.py
index cadce52044..cadce52044 100755
--- a/gr-filter/python/qa_adaptive_fir_filter.py
+++ b/gr-filter/python/filter/qa_adaptive_fir_filter.py
diff --git a/gr-filter/python/qa_dc_blocker.py b/gr-filter/python/filter/qa_dc_blocker.py
index b9df06b453..b9df06b453 100755
--- a/gr-filter/python/qa_dc_blocker.py
+++ b/gr-filter/python/filter/qa_dc_blocker.py
diff --git a/gr-filter/python/qa_fft_filter.py b/gr-filter/python/filter/qa_fft_filter.py
index cb5416373f..cb5416373f 100755
--- a/gr-filter/python/qa_fft_filter.py
+++ b/gr-filter/python/filter/qa_fft_filter.py
diff --git a/gr-filter/python/qa_filter_delay_fc.py b/gr-filter/python/filter/qa_filter_delay_fc.py
index 420d6fb05f..420d6fb05f 100755
--- a/gr-filter/python/qa_filter_delay_fc.py
+++ b/gr-filter/python/filter/qa_filter_delay_fc.py
diff --git a/gr-filter/python/qa_fir_filter.py b/gr-filter/python/filter/qa_fir_filter.py
index 2a61498a26..2a61498a26 100755
--- a/gr-filter/python/qa_fir_filter.py
+++ b/gr-filter/python/filter/qa_fir_filter.py
diff --git a/gr-filter/python/qa_firdes.py b/gr-filter/python/filter/qa_firdes.py
index cfd10435f5..cfd10435f5 100755
--- a/gr-filter/python/qa_firdes.py
+++ b/gr-filter/python/filter/qa_firdes.py
diff --git a/gr-filter/python/qa_fractional_interpolator.py b/gr-filter/python/filter/qa_fractional_interpolator.py
index ab4cc4cf9a..ab4cc4cf9a 100755
--- a/gr-filter/python/qa_fractional_interpolator.py
+++ b/gr-filter/python/filter/qa_fractional_interpolator.py
diff --git a/gr-filter/python/qa_freq_xlating_fir_filter.py b/gr-filter/python/filter/qa_freq_xlating_fir_filter.py
index ee38eb7dff..ee38eb7dff 100755
--- a/gr-filter/python/qa_freq_xlating_fir_filter.py
+++ b/gr-filter/python/filter/qa_freq_xlating_fir_filter.py
diff --git a/gr-filter/python/qa_hilbert.py b/gr-filter/python/filter/qa_hilbert.py
index c3522ed192..c3522ed192 100755
--- a/gr-filter/python/qa_hilbert.py
+++ b/gr-filter/python/filter/qa_hilbert.py
diff --git a/gr-filter/python/qa_iir_filter.py b/gr-filter/python/filter/qa_iir_filter.py
index 645c4b66e7..645c4b66e7 100755
--- a/gr-filter/python/qa_iir_filter.py
+++ b/gr-filter/python/filter/qa_iir_filter.py
diff --git a/gr-filter/python/qa_interp_fir_filter.py b/gr-filter/python/filter/qa_interp_fir_filter.py
index 839330539b..839330539b 100755
--- a/gr-filter/python/qa_interp_fir_filter.py
+++ b/gr-filter/python/filter/qa_interp_fir_filter.py
diff --git a/gr-filter/python/qa_pfb_arb_resampler.py b/gr-filter/python/filter/qa_pfb_arb_resampler.py
index 98272013ef..98272013ef 100755
--- a/gr-filter/python/qa_pfb_arb_resampler.py
+++ b/gr-filter/python/filter/qa_pfb_arb_resampler.py
diff --git a/gr-filter/python/qa_pfb_channelizer.py b/gr-filter/python/filter/qa_pfb_channelizer.py
index 519afa0458..519afa0458 100755
--- a/gr-filter/python/qa_pfb_channelizer.py
+++ b/gr-filter/python/filter/qa_pfb_channelizer.py
diff --git a/gr-filter/python/qa_pfb_decimator.py b/gr-filter/python/filter/qa_pfb_decimator.py
index d20b2fa856..d20b2fa856 100755
--- a/gr-filter/python/qa_pfb_decimator.py
+++ b/gr-filter/python/filter/qa_pfb_decimator.py
diff --git a/gr-filter/python/qa_pfb_interpolator.py b/gr-filter/python/filter/qa_pfb_interpolator.py
index ffaeee3f68..ffaeee3f68 100755
--- a/gr-filter/python/qa_pfb_interpolator.py
+++ b/gr-filter/python/filter/qa_pfb_interpolator.py
diff --git a/gr-filter/python/qa_pfb_synthesizer.py b/gr-filter/python/filter/qa_pfb_synthesizer.py
index 2da02b58d3..2da02b58d3 100755
--- a/gr-filter/python/qa_pfb_synthesizer.py
+++ b/gr-filter/python/filter/qa_pfb_synthesizer.py
diff --git a/gr-filter/python/qa_pm_remez.py b/gr-filter/python/filter/qa_pm_remez.py
index a76e14c938..a76e14c938 100755
--- a/gr-filter/python/qa_pm_remez.py
+++ b/gr-filter/python/filter/qa_pm_remez.py
diff --git a/gr-filter/python/qa_rational_resampler.py b/gr-filter/python/filter/qa_rational_resampler.py
index eb86ef5425..eb86ef5425 100755
--- a/gr-filter/python/qa_rational_resampler.py
+++ b/gr-filter/python/filter/qa_rational_resampler.py
diff --git a/gr-filter/python/qa_single_pole_iir.py b/gr-filter/python/filter/qa_single_pole_iir.py
index d28ab643fd..d28ab643fd 100755
--- a/gr-filter/python/qa_single_pole_iir.py
+++ b/gr-filter/python/filter/qa_single_pole_iir.py
diff --git a/gr-filter/python/rational_resampler.py b/gr-filter/python/filter/rational_resampler.py
index 97df283e67..97df283e67 100644
--- a/gr-filter/python/rational_resampler.py
+++ b/gr-filter/python/filter/rational_resampler.py