diff --git a/gnuradio-core/src/python/gnuradio/__init__.py b/gnuradio-core/src/python/gnuradio/__init__.py
index 3b704240eb..123050eb9a 100644
--- a/gnuradio-core/src/python/gnuradio/__init__.py
+++ b/gnuradio-core/src/python/gnuradio/__init__.py

diff --git a/gr-digital/CMakeLists.txt b/gr-digital/CMakeLists.txt
index ac0dbb737d..49702b627d 100644
--- a/gr-digital/CMakeLists.txt
+++ b/gr-digital/CMakeLists.txt

diff --git a/gr-digital/python/CMakeLists.txt b/gr-digital/python/digital/CMakeLists.txt
index 7f35e3c2be..7f35e3c2be 100644
--- a/gr-digital/python/CMakeLists.txt
+++ b/gr-digital/python/digital/CMakeLists.txt

diff --git a/gr-digital/python/__init__.py b/gr-digital/python/digital/__init__.py
index 962f210324..d37c900929 100644
--- a/gr-digital/python/__init__.py
+++ b/gr-digital/python/digital/__init__.py

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 a9915ba91a..a9915ba91a 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 4a2ef7721f..4a2ef7721f 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 f5b2084766..f5b2084766 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 e4aeef8ef9..e4aeef8ef9 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 a90e49a521..a90e49a521 100644
--- a/gr-digital/python/gmsk.py
+++ b/gr-digital/python/digital/gmsk.py

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 5bbe111f31..5bbe111f31 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 f4fc5f5ba3..f4fc5f5ba3 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 9bac789bf6..9bac789bf6 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 76c00f3a54..76c00f3a54 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 63e85135bc..63e85135bc 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 547b1e93c0..547b1e93c0 100644
--- a/gr-digital/python/ofdm_sync_pnac.py
+++ b/gr-digital/python/digital/ofdm_sync_pnac.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 22f7da73ff..22f7da73ff 100755
--- a/gr-digital/python/qa_binary_slicer_fb.py
+++ b/gr-digital/python/digital/qa_binary_slicer_fb.py

diff --git a/gr-digital/python/qa_chunks_to_symbols.py b/gr-digital/python/digital/qa_chunks_to_symbols.py
index 5ffe425132..5ffe425132 100755
--- a/gr-digital/python/qa_chunks_to_symbols.py
+++ b/gr-digital/python/digital/qa_chunks_to_symbols.py

diff --git a/gr-digital/python/qa_clock_recovery_mm.py b/gr-digital/python/digital/qa_clock_recovery_mm.py
index e904cf4c21..e904cf4c21 100755
--- a/gr-digital/python/qa_clock_recovery_mm.py
+++ b/gr-digital/python/digital/qa_clock_recovery_mm.py

diff --git a/gr-digital/python/qa_cma_equalizer.py b/gr-digital/python/digital/qa_cma_equalizer.py
index f71e199189..f71e199189 100755
--- a/gr-digital/python/qa_cma_equalizer.py
+++ b/gr-digital/python/digital/qa_cma_equalizer.py

diff --git a/gr-digital/python/qa_constellation.py b/gr-digital/python/digital/qa_constellation.py
index a593c3ea3e..a593c3ea3e 100755
--- a/gr-digital/python/qa_constellation.py
+++ b/gr-digital/python/digital/qa_constellation.py

diff --git a/gr-digital/python/qa_constellation_decoder_cb.py b/gr-digital/python/digital/qa_constellation_decoder_cb.py
index 6a93b6e743..6a93b6e743 100755
--- a/gr-digital/python/qa_constellation_decoder_cb.py
+++ b/gr-digital/python/digital/qa_constellation_decoder_cb.py

diff --git a/gr-digital/python/qa_constellation_receiver.py b/gr-digital/python/digital/qa_constellation_receiver.py
index bc44220ea9..bc44220ea9 100755
--- a/gr-digital/python/qa_constellation_receiver.py
+++ b/gr-digital/python/digital/qa_constellation_receiver.py

diff --git a/gr-digital/python/qa_correlate_access_code.py b/gr-digital/python/digital/qa_correlate_access_code.py
index 5a5f2209f7..5a5f2209f7 100755
--- a/gr-digital/python/qa_correlate_access_code.py
+++ b/gr-digital/python/digital/qa_correlate_access_code.py

diff --git a/gr-digital/python/qa_costas_loop_cc.py b/gr-digital/python/digital/qa_costas_loop_cc.py
index 365eda736a..365eda736a 100755
--- a/gr-digital/python/qa_costas_loop_cc.py
+++ b/gr-digital/python/digital/qa_costas_loop_cc.py

diff --git a/gr-digital/python/qa_cpm.py b/gr-digital/python/digital/qa_cpm.py
index 070e69a982..070e69a982 100755
--- a/gr-digital/python/qa_cpm.py
+++ b/gr-digital/python/digital/qa_cpm.py

diff --git a/gr-digital/python/qa_crc32.py b/gr-digital/python/digital/qa_crc32.py
index cd4006b1d3..cd4006b1d3 100755
--- a/gr-digital/python/qa_crc32.py
+++ b/gr-digital/python/digital/qa_crc32.py

diff --git a/gr-digital/python/qa_diff_encoder.py b/gr-digital/python/digital/qa_diff_encoder.py
index c28f4dbdf8..c28f4dbdf8 100755
--- a/gr-digital/python/qa_diff_encoder.py
+++ b/gr-digital/python/digital/qa_diff_encoder.py

diff --git a/gr-digital/python/qa_diff_phasor_cc.py b/gr-digital/python/digital/qa_diff_phasor_cc.py
index 833158d0a8..833158d0a8 100755
--- a/gr-digital/python/qa_diff_phasor_cc.py
+++ b/gr-digital/python/digital/qa_diff_phasor_cc.py

diff --git a/gr-digital/python/qa_digital.py b/gr-digital/python/digital/qa_digital.py
index 6f54f14208..6f54f14208 100755
--- a/gr-digital/python/qa_digital.py
+++ b/gr-digital/python/digital/qa_digital.py

diff --git a/gr-digital/python/qa_fll_band_edge.py b/gr-digital/python/digital/qa_fll_band_edge.py
index 0f6bad984e..0f6bad984e 100755
--- a/gr-digital/python/qa_fll_band_edge.py
+++ b/gr-digital/python/digital/qa_fll_band_edge.py

diff --git a/gr-digital/python/qa_framer_sink.py b/gr-digital/python/digital/qa_framer_sink.py
index e717e6ae05..e717e6ae05 100755
--- a/gr-digital/python/qa_framer_sink.py
+++ b/gr-digital/python/digital/qa_framer_sink.py

diff --git a/gr-digital/python/qa_glfsr_source.py b/gr-digital/python/digital/qa_glfsr_source.py
index c5adab3023..c5adab3023 100755
--- a/gr-digital/python/qa_glfsr_source.py
+++ b/gr-digital/python/digital/qa_glfsr_source.py

diff --git a/gr-digital/python/qa_lfsr.py b/gr-digital/python/digital/qa_lfsr.py
index d70c466ca7..d70c466ca7 100755
--- a/gr-digital/python/qa_lfsr.py
+++ b/gr-digital/python/digital/qa_lfsr.py

diff --git a/gr-digital/python/qa_lms_equalizer.py b/gr-digital/python/digital/qa_lms_equalizer.py
index 9ba90a89ab..9ba90a89ab 100755
--- a/gr-digital/python/qa_lms_equalizer.py
+++ b/gr-digital/python/digital/qa_lms_equalizer.py

diff --git a/gr-digital/python/qa_map.py b/gr-digital/python/digital/qa_map.py
index 0fd7c479a1..0fd7c479a1 100755
--- a/gr-digital/python/qa_map.py
+++ b/gr-digital/python/digital/qa_map.py

diff --git a/gr-digital/python/qa_mpsk_receiver.py b/gr-digital/python/digital/qa_mpsk_receiver.py
index bde8895e76..bde8895e76 100755
--- a/gr-digital/python/qa_mpsk_receiver.py
+++ b/gr-digital/python/digital/qa_mpsk_receiver.py

diff --git a/gr-digital/python/qa_mpsk_snr_est.py b/gr-digital/python/digital/qa_mpsk_snr_est.py
index c976bf21a8..c976bf21a8 100755
--- a/gr-digital/python/qa_mpsk_snr_est.py
+++ b/gr-digital/python/digital/qa_mpsk_snr_est.py

diff --git a/gr-digital/python/qa_ofdm_insert_preamble.py b/gr-digital/python/digital/qa_ofdm_insert_preamble.py
index 60902edc14..60902edc14 100755
--- a/gr-digital/python/qa_ofdm_insert_preamble.py
+++ b/gr-digital/python/digital/qa_ofdm_insert_preamble.py

diff --git a/gr-digital/python/qa_pfb_clock_sync.py b/gr-digital/python/digital/qa_pfb_clock_sync.py
index 4d0276bcd6..4d0276bcd6 100755
--- a/gr-digital/python/qa_pfb_clock_sync.py
+++ b/gr-digital/python/digital/qa_pfb_clock_sync.py

diff --git a/gr-digital/python/qa_pn_correlator_cc.py b/gr-digital/python/digital/qa_pn_correlator_cc.py
index 53633d04fa..53633d04fa 100755
--- a/gr-digital/python/qa_pn_correlator_cc.py
+++ b/gr-digital/python/digital/qa_pn_correlator_cc.py

diff --git a/gr-digital/python/qa_probe_density.py b/gr-digital/python/digital/qa_probe_density.py
index f42f00a7f7..f42f00a7f7 100755
--- a/gr-digital/python/qa_probe_density.py
+++ b/gr-digital/python/digital/qa_probe_density.py

diff --git a/gr-digital/python/qa_scrambler.py b/gr-digital/python/digital/qa_scrambler.py
index 3127a7c1e6..3127a7c1e6 100755
--- a/gr-digital/python/qa_scrambler.py
+++ b/gr-digital/python/digital/qa_scrambler.py

diff --git a/gr-digital/python/qa_simple_correlator.py b/gr-digital/python/digital/qa_simple_correlator.py
index ff0faeb415..ff0faeb415 100755
--- a/gr-digital/python/qa_simple_correlator.py
+++ b/gr-digital/python/digital/qa_simple_correlator.py

diff --git a/gr-digital/python/qa_simple_framer.py b/gr-digital/python/digital/qa_simple_framer.py
index f8c894da28..f8c894da28 100755
--- a/gr-digital/python/qa_simple_framer.py
+++ b/gr-digital/python/digital/qa_simple_framer.py

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