diff --git a/gnuradio-core/src/python/gnuradio/__init__.py b/gnuradio-core/src/python/gnuradio/__init__.py
index e17978c76a..57490a8d16 100644
--- a/gnuradio-core/src/python/gnuradio/__init__.py
+++ b/gnuradio-core/src/python/gnuradio/__init__.py

diff --git a/gr-wxgui/CMakeLists.txt b/gr-wxgui/CMakeLists.txt
index 04c4a26569..2f129713f8 100644
--- a/gr-wxgui/CMakeLists.txt
+++ b/gr-wxgui/CMakeLists.txt

diff --git a/gr-wxgui/python/CMakeLists.txt b/gr-wxgui/python/wxgui/CMakeLists.txt
index 24e06acd5e..24e06acd5e 100644
--- a/gr-wxgui/python/CMakeLists.txt
+++ b/gr-wxgui/python/wxgui/CMakeLists.txt

diff --git a/gr-wxgui/python/__init__.py b/gr-wxgui/python/wxgui/__init__.py
index 07dbaf1620..07dbaf1620 100644
--- a/gr-wxgui/python/__init__.py
+++ b/gr-wxgui/python/wxgui/__init__.py

diff --git a/gr-wxgui/python/common.py b/gr-wxgui/python/wxgui/common.py
index 57fc530f88..57fc530f88 100644
--- a/gr-wxgui/python/common.py
+++ b/gr-wxgui/python/wxgui/common.py

diff --git a/gr-wxgui/python/const_window.py b/gr-wxgui/python/wxgui/const_window.py
index 1295aff1fa..1295aff1fa 100644
--- a/gr-wxgui/python/const_window.py
+++ b/gr-wxgui/python/wxgui/const_window.py

diff --git a/gr-wxgui/python/constants.py b/gr-wxgui/python/wxgui/constants.py
index 08cc6a6343..08cc6a6343 100644
--- a/gr-wxgui/python/constants.py
+++ b/gr-wxgui/python/wxgui/constants.py

diff --git a/gr-wxgui/python/constsink_gl.py b/gr-wxgui/python/wxgui/constsink_gl.py
index 0313e7fea0..0313e7fea0 100644
--- a/gr-wxgui/python/constsink_gl.py
+++ b/gr-wxgui/python/wxgui/constsink_gl.py

diff --git a/gr-wxgui/python/fft_window.py b/gr-wxgui/python/wxgui/fft_window.py
index ada926c418..ada926c418 100644
--- a/gr-wxgui/python/fft_window.py
+++ b/gr-wxgui/python/wxgui/fft_window.py

diff --git a/gr-wxgui/python/fftsink2.py b/gr-wxgui/python/wxgui/fftsink2.py
index 3277cd3ffa..3277cd3ffa 100644
--- a/gr-wxgui/python/fftsink2.py
+++ b/gr-wxgui/python/wxgui/fftsink2.py

diff --git a/gr-wxgui/python/fftsink_gl.py b/gr-wxgui/python/wxgui/fftsink_gl.py
index 272a2456ce..272a2456ce 100644
--- a/gr-wxgui/python/fftsink_gl.py
+++ b/gr-wxgui/python/wxgui/fftsink_gl.py

diff --git a/gr-wxgui/python/fftsink_nongl.py b/gr-wxgui/python/wxgui/fftsink_nongl.py
index 73bc7f41b0..73bc7f41b0 100644
--- a/gr-wxgui/python/fftsink_nongl.py
+++ b/gr-wxgui/python/wxgui/fftsink_nongl.py

diff --git a/gr-wxgui/python/form.py b/gr-wxgui/python/wxgui/form.py
index 0442e49c84..0442e49c84 100644
--- a/gr-wxgui/python/form.py
+++ b/gr-wxgui/python/wxgui/form.py

diff --git a/gr-wxgui/python/forms/__init__.py b/gr-wxgui/python/wxgui/forms/__init__.py
index 67d3b4a88a..67d3b4a88a 100644
--- a/gr-wxgui/python/forms/__init__.py
+++ b/gr-wxgui/python/wxgui/forms/__init__.py

diff --git a/gr-wxgui/python/forms/converters.py b/gr-wxgui/python/wxgui/forms/converters.py
index db14d2752c..db14d2752c 100644
--- a/gr-wxgui/python/forms/converters.py
+++ b/gr-wxgui/python/wxgui/forms/converters.py

diff --git a/gr-wxgui/python/forms/forms.py b/gr-wxgui/python/wxgui/forms/forms.py
index 80822ae174..80822ae174 100644
--- a/gr-wxgui/python/forms/forms.py
+++ b/gr-wxgui/python/wxgui/forms/forms.py

diff --git a/gr-wxgui/python/gui.py b/gr-wxgui/python/wxgui/gui.py
index ccc773eabf..ccc773eabf 100644
--- a/gr-wxgui/python/gui.py
+++ b/gr-wxgui/python/wxgui/gui.py

diff --git a/gr-wxgui/python/histo_window.py b/gr-wxgui/python/wxgui/histo_window.py
index 3e38fdcb64..3e38fdcb64 100644
--- a/gr-wxgui/python/histo_window.py
+++ b/gr-wxgui/python/wxgui/histo_window.py

diff --git a/gr-wxgui/python/histosink_gl.py b/gr-wxgui/python/wxgui/histosink_gl.py
index 6fa7539aa7..6fa7539aa7 100644
--- a/gr-wxgui/python/histosink_gl.py
+++ b/gr-wxgui/python/wxgui/histosink_gl.py

diff --git a/gr-wxgui/python/number_window.py b/gr-wxgui/python/wxgui/number_window.py
index 751047db94..751047db94 100644
--- a/gr-wxgui/python/number_window.py
+++ b/gr-wxgui/python/wxgui/number_window.py

diff --git a/gr-wxgui/python/numbersink2.py b/gr-wxgui/python/wxgui/numbersink2.py
index 62a096e112..62a096e112 100644
--- a/gr-wxgui/python/numbersink2.py
+++ b/gr-wxgui/python/wxgui/numbersink2.py

diff --git a/gr-wxgui/python/plot.py b/gr-wxgui/python/wxgui/plot.py
index 041a2a7a50..041a2a7a50 100644
--- a/gr-wxgui/python/plot.py
+++ b/gr-wxgui/python/wxgui/plot.py

diff --git a/gr-wxgui/python/plotter/__init__.py b/gr-wxgui/python/wxgui/plotter/__init__.py
index 616492a3e6..616492a3e6 100644
--- a/gr-wxgui/python/plotter/__init__.py
+++ b/gr-wxgui/python/wxgui/plotter/__init__.py

diff --git a/gr-wxgui/python/plotter/bar_plotter.py b/gr-wxgui/python/wxgui/plotter/bar_plotter.py
index 487db66b64..487db66b64 100644
--- a/gr-wxgui/python/plotter/bar_plotter.py
+++ b/gr-wxgui/python/wxgui/plotter/bar_plotter.py

diff --git a/gr-wxgui/python/plotter/channel_plotter.py b/gr-wxgui/python/wxgui/plotter/channel_plotter.py
index 1eac9f5f3a..1eac9f5f3a 100644
--- a/gr-wxgui/python/plotter/channel_plotter.py
+++ b/gr-wxgui/python/wxgui/plotter/channel_plotter.py

diff --git a/gr-wxgui/python/plotter/common.py b/gr-wxgui/python/wxgui/plotter/common.py
index 9af636245d..9af636245d 100644
--- a/gr-wxgui/python/plotter/common.py
+++ b/gr-wxgui/python/wxgui/plotter/common.py

diff --git a/gr-wxgui/python/plotter/gltext.py b/gr-wxgui/python/wxgui/plotter/gltext.py
index 0b6e3f55b3..0b6e3f55b3 100644
--- a/gr-wxgui/python/plotter/gltext.py
+++ b/gr-wxgui/python/wxgui/plotter/gltext.py

diff --git a/gr-wxgui/python/plotter/grid_plotter_base.py b/gr-wxgui/python/wxgui/plotter/grid_plotter_base.py
index a492539575..a492539575 100644
--- a/gr-wxgui/python/plotter/grid_plotter_base.py
+++ b/gr-wxgui/python/wxgui/plotter/grid_plotter_base.py

diff --git a/gr-wxgui/python/plotter/plotter_base.py b/gr-wxgui/python/wxgui/plotter/plotter_base.py
index 78e21f3c1d..78e21f3c1d 100644
--- a/gr-wxgui/python/plotter/plotter_base.py
+++ b/gr-wxgui/python/wxgui/plotter/plotter_base.py

diff --git a/gr-wxgui/python/plotter/waterfall_plotter.py b/gr-wxgui/python/wxgui/plotter/waterfall_plotter.py
index 02ec67ee4c..02ec67ee4c 100644
--- a/gr-wxgui/python/plotter/waterfall_plotter.py
+++ b/gr-wxgui/python/wxgui/plotter/waterfall_plotter.py

diff --git a/gr-wxgui/python/powermate.py b/gr-wxgui/python/wxgui/powermate.py
index 7c324c5d95..7c324c5d95 100644
--- a/gr-wxgui/python/powermate.py
+++ b/gr-wxgui/python/wxgui/powermate.py

diff --git a/gr-wxgui/python/pubsub.py b/gr-wxgui/python/wxgui/pubsub.py
index e55d691978..e55d691978 100644
--- a/gr-wxgui/python/pubsub.py
+++ b/gr-wxgui/python/wxgui/pubsub.py

diff --git a/gr-wxgui/python/scope_window.py b/gr-wxgui/python/wxgui/scope_window.py
index 306e1757f1..306e1757f1 100644
--- a/gr-wxgui/python/scope_window.py
+++ b/gr-wxgui/python/wxgui/scope_window.py

diff --git a/gr-wxgui/python/scopesink2.py b/gr-wxgui/python/wxgui/scopesink2.py
index 99e268895a..99e268895a 100644
--- a/gr-wxgui/python/scopesink2.py
+++ b/gr-wxgui/python/wxgui/scopesink2.py

diff --git a/gr-wxgui/python/scopesink_gl.py b/gr-wxgui/python/wxgui/scopesink_gl.py
index 21d7169026..21d7169026 100644
--- a/gr-wxgui/python/scopesink_gl.py
+++ b/gr-wxgui/python/wxgui/scopesink_gl.py

diff --git a/gr-wxgui/python/scopesink_nongl.py b/gr-wxgui/python/wxgui/scopesink_nongl.py
index 2c5ff9278a..2c5ff9278a 100644
--- a/gr-wxgui/python/scopesink_nongl.py
+++ b/gr-wxgui/python/wxgui/scopesink_nongl.py

diff --git a/gr-wxgui/python/slider.py b/gr-wxgui/python/wxgui/slider.py
index 7194de47c2..7194de47c2 100644
--- a/gr-wxgui/python/slider.py
+++ b/gr-wxgui/python/wxgui/slider.py

diff --git a/gr-wxgui/python/stdgui2.py b/gr-wxgui/python/wxgui/stdgui2.py
index 71436d72c4..71436d72c4 100644
--- a/gr-wxgui/python/stdgui2.py
+++ b/gr-wxgui/python/wxgui/stdgui2.py

diff --git a/gr-wxgui/python/termsink.py b/gr-wxgui/python/wxgui/termsink.py
index a0cfd575d6..a0cfd575d6 100644
--- a/gr-wxgui/python/termsink.py
+++ b/gr-wxgui/python/wxgui/termsink.py

diff --git a/gr-wxgui/python/waterfall_window.py b/gr-wxgui/python/wxgui/waterfall_window.py
index 7d401223c2..7d401223c2 100644
--- a/gr-wxgui/python/waterfall_window.py
+++ b/gr-wxgui/python/wxgui/waterfall_window.py

diff --git a/gr-wxgui/python/waterfallsink2.py b/gr-wxgui/python/wxgui/waterfallsink2.py
index 0b876fc3e2..0b876fc3e2 100644
--- a/gr-wxgui/python/waterfallsink2.py
+++ b/gr-wxgui/python/wxgui/waterfallsink2.py

diff --git a/gr-wxgui/python/waterfallsink_gl.py b/gr-wxgui/python/wxgui/waterfallsink_gl.py
index ead97df1e7..ead97df1e7 100644
--- a/gr-wxgui/python/waterfallsink_gl.py
+++ b/gr-wxgui/python/wxgui/waterfallsink_gl.py

diff --git a/gr-wxgui/python/waterfallsink_nongl.py b/gr-wxgui/python/wxgui/waterfallsink_nongl.py
index 37b8281927..37b8281927 100644
--- a/gr-wxgui/python/waterfallsink_nongl.py
+++ b/gr-wxgui/python/wxgui/waterfallsink_nongl.py