194 files changed, 30 insertions, 5 deletions
diff --git a/grc/data/Makefile.am b/grc/data/Makefile.am
index 7174279ba..961c183fb 100644
--- a/grc/data/Makefile.am
+++ b/grc/data/Makefile.am
@@ -21,4 +21,4 @@
 
 include $(top_srcdir)/grc/Makefile.inc
 
-SUBDIRS = grc grc_gnuradio
+SUBDIRS = platforms
diff --git a/grc/data/platforms/Makefile.am b/grc/data/platforms/Makefile.am
new file mode 100644
index 000000000..d26abd9ba
--- /dev/null
+++ b/grc/data/platforms/Makefile.am
@@ -0,0 +1,24 @@
+#
+# Copyright 2008 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+#
+
+include $(top_srcdir)/grc/Makefile.inc
+
+SUBDIRS = base python
diff --git a/grc/data/grc/Makefile.am b/grc/data/platforms/base/Makefile.am
index f95d17c39..f3bd0aba0 100644
--- a/grc/data/grc/Makefile.am
+++ b/grc/data/platforms/base/Makefile.am
@@ -21,7 +21,7 @@
 
 include $(top_srcdir)/grc/Makefile.inc
 
-ourdatadir = $(grc_data_dir)
+ourdatadir = $(grc_base_data_dir)
 
 DATA_FILES = \
 	block_tree.dtd \
diff --git a/grc/data/grc/block_tree.dtd b/grc/data/platforms/base/block_tree.dtd
index be1524a38..be1524a38 100644
--- a/grc/data/grc/block_tree.dtd
+++ b/grc/data/platforms/base/block_tree.dtd
diff --git a/grc/data/grc/flow_graph.dtd b/grc/data/platforms/base/flow_graph.dtd
index 904147b37..904147b37 100644
--- a/grc/data/grc/flow_graph.dtd
+++ b/grc/data/platforms/base/flow_graph.dtd
diff --git a/grc/data/grc/grc-icon-256.png b/grc/data/platforms/base/grc-icon-256.png
index e4e8e54ae..e4e8e54ae 100644
--- a/grc/data/grc/grc-icon-256.png
+++ b/grc/data/platforms/base/grc-icon-256.png
diff --git a/grc/data/grc/grc-icon-256.svg b/grc/data/platforms/base/grc-icon-256.svg
index 87526d46c..87526d46c 100644
--- a/grc/data/grc/grc-icon-256.svg
+++ b/grc/data/platforms/base/grc-icon-256.svg
diff --git a/grc/data/grc/grc-icon-32.png b/grc/data/platforms/base/grc-icon-32.png
index 1e4f4f6c5..1e4f4f6c5 100644
--- a/grc/data/grc/grc-icon-32.png
+++ b/grc/data/platforms/base/grc-icon-32.png
diff --git a/grc/data/grc_gnuradio/Makefile.am b/grc/data/platforms/python/Makefile.am
index c0e98960b..a23e04018 100644
--- a/grc/data/grc_gnuradio/Makefile.am
+++ b/grc/data/platforms/python/Makefile.am
@@ -23,7 +23,7 @@ include $(top_srcdir)/grc/Makefile.inc
 
 SUBDIRS = blocks
 
-ourdatadir = $(grc_gnuradio_data_dir)
+ourdatadir = $(grc_python_data_dir)
 
 DATA_FILES = \
 	block.dtd \
diff --git a/grc/data/grc_gnuradio/block.dtd b/grc/data/platforms/python/block.dtd
index d892b1287..d892b1287 100644
--- a/grc/data/grc_gnuradio/block.dtd
+++ b/grc/data/platforms/python/block.dtd
diff --git a/grc/data/grc_gnuradio/block_tree.xml b/grc/data/platforms/python/block_tree.xml
index 7ac9e5199..7ac9e5199 100644
--- a/grc/data/grc_gnuradio/block_tree.xml
+++ b/grc/data/platforms/python/block_tree.xml
diff --git a/grc/data/grc_gnuradio/blocks/Makefile.am b/grc/data/platforms/python/blocks/Makefile.am
index 877ed9801..766156477 100644
--- a/grc/data/grc_gnuradio/blocks/Makefile.am
+++ b/grc/data/platforms/python/blocks/Makefile.am
@@ -21,7 +21,7 @@
 
 include $(top_srcdir)/grc/Makefile.inc
 
-ourdatadir = $(grc_gnuradio_blocks_dir)
+ourdatadir = $(grc_python_blocks_dir)
 
 DATA_FILES = \
 	audio_sink.xml \
diff --git a/grc/data/grc_gnuradio/blocks/audio_sink.xml b/grc/data/platforms/python/blocks/audio_sink.xml
index 56c5980fc..56c5980fc 100644
--- a/grc/data/grc_gnuradio/blocks/audio_sink.xml
+++ b/grc/data/platforms/python/blocks/audio_sink.xml
diff --git a/grc/data/grc_gnuradio/blocks/audio_source.xml b/grc/data/platforms/python/blocks/audio_source.xml
index 2ae74e491..2ae74e491 100644
--- a/grc/data/grc_gnuradio/blocks/audio_source.xml
+++ b/grc/data/platforms/python/blocks/audio_source.xml
diff --git a/grc/data/grc_gnuradio/blocks/band_pass_filter.xml b/grc/data/platforms/python/blocks/band_pass_filter.xml
index 2dac2960e..2dac2960e 100644
--- a/grc/data/grc_gnuradio/blocks/band_pass_filter.xml
+++ b/grc/data/platforms/python/blocks/band_pass_filter.xml
diff --git a/grc/data/grc_gnuradio/blocks/band_reject_filter.xml b/grc/data/platforms/python/blocks/band_reject_filter.xml
index ed6a5fa88..ed6a5fa88 100644
--- a/grc/data/grc_gnuradio/blocks/band_reject_filter.xml
+++ b/grc/data/platforms/python/blocks/band_reject_filter.xml
diff --git a/grc/data/grc_gnuradio/blocks/blks2_am_demod_cf.xml b/grc/data/platforms/python/blocks/blks2_am_demod_cf.xml
index 898c613be..898c613be 100644
--- a/grc/data/grc_gnuradio/blocks/blks2_am_demod_cf.xml
+++ b/grc/data/platforms/python/blocks/blks2_am_demod_cf.xml
diff --git a/grc/data/grc_gnuradio/blocks/blks2_analysis_filterbank.xml b/grc/data/platforms/python/blocks/blks2_analysis_filterbank.xml
index 93cfa30af..93cfa30af 100644
--- a/grc/data/grc_gnuradio/blocks/blks2_analysis_filterbank.xml
+++ b/grc/data/platforms/python/blocks/blks2_analysis_filterbank.xml
diff --git a/grc/data/grc_gnuradio/blocks/blks2_channel_model.xml b/grc/data/platforms/python/blocks/blks2_channel_model.xml
index 88805636c..88805636c 100644
--- a/grc/data/grc_gnuradio/blocks/blks2_channel_model.xml
+++ b/grc/data/platforms/python/blocks/blks2_channel_model.xml
diff --git a/grc/data/grc_gnuradio/blocks/blks2_dxpsk_demod.xml b/grc/data/platforms/python/blocks/blks2_dxpsk_demod.xml
index 20c7bd7f7..20c7bd7f7 100644
--- a/grc/data/grc_gnuradio/blocks/blks2_dxpsk_demod.xml
+++ b/grc/data/platforms/python/blocks/blks2_dxpsk_demod.xml
diff --git a/grc/data/grc_gnuradio/blocks/blks2_dxpsk_mod.xml b/grc/data/platforms/python/blocks/blks2_dxpsk_mod.xml
index e165fe9b7..e165fe9b7 100644
--- a/grc/data/grc_gnuradio/blocks/blks2_dxpsk_mod.xml
+++ b/grc/data/platforms/python/blocks/blks2_dxpsk_mod.xml
diff --git a/grc/data/grc_gnuradio/blocks/blks2_error_rate.xml b/grc/data/platforms/python/blocks/blks2_error_rate.xml
index 79703f6e9..79703f6e9 100644
--- a/grc/data/grc_gnuradio/blocks/blks2_error_rate.xml
+++ b/grc/data/platforms/python/blocks/blks2_error_rate.xml
diff --git a/grc/data/grc_gnuradio/blocks/blks2_fm_deemph.xml b/grc/data/platforms/python/blocks/blks2_fm_deemph.xml
index 6f38dab6d..6f38dab6d 100644
--- a/grc/data/grc_gnuradio/blocks/blks2_fm_deemph.xml
+++ b/grc/data/platforms/python/blocks/blks2_fm_deemph.xml
diff --git a/grc/data/grc_gnuradio/blocks/blks2_fm_demod_cf.xml b/grc/data/platforms/python/blocks/blks2_fm_demod_cf.xml
index 2ce1fb973..2ce1fb973 100644
--- a/grc/data/grc_gnuradio/blocks/blks2_fm_demod_cf.xml
+++ b/grc/data/platforms/python/blocks/blks2_fm_demod_cf.xml
diff --git a/grc/data/grc_gnuradio/blocks/blks2_fm_preemph.xml b/grc/data/platforms/python/blocks/blks2_fm_preemph.xml
index 672a7a7b2..672a7a7b2 100644
--- a/grc/data/grc_gnuradio/blocks/blks2_fm_preemph.xml
+++ b/grc/data/platforms/python/blocks/blks2_fm_preemph.xml
diff --git a/grc/data/grc_gnuradio/blocks/blks2_gmsk_demod.xml b/grc/data/platforms/python/blocks/blks2_gmsk_demod.xml
index c81039815..c81039815 100644
--- a/grc/data/grc_gnuradio/blocks/blks2_gmsk_demod.xml
+++ b/grc/data/platforms/python/blocks/blks2_gmsk_demod.xml
diff --git a/grc/data/grc_gnuradio/blocks/blks2_gmsk_mod.xml b/grc/data/platforms/python/blocks/blks2_gmsk_mod.xml
index ab57357eb..ab57357eb 100644
--- a/grc/data/grc_gnuradio/blocks/blks2_gmsk_mod.xml
+++ b/grc/data/platforms/python/blocks/blks2_gmsk_mod.xml
diff --git a/grc/data/grc_gnuradio/blocks/blks2_logpwrfft_x.xml b/grc/data/platforms/python/blocks/blks2_logpwrfft_x.xml
index ef49c443e..ef49c443e 100644
--- a/grc/data/grc_gnuradio/blocks/blks2_logpwrfft_x.xml
+++ b/grc/data/platforms/python/blocks/blks2_logpwrfft_x.xml
diff --git a/grc/data/grc_gnuradio/blocks/blks2_nbfm_rx.xml b/grc/data/platforms/python/blocks/blks2_nbfm_rx.xml
index d332b9a6b..d332b9a6b 100644
--- a/grc/data/grc_gnuradio/blocks/blks2_nbfm_rx.xml
+++ b/grc/data/platforms/python/blocks/blks2_nbfm_rx.xml
diff --git a/grc/data/grc_gnuradio/blocks/blks2_nbfm_tx.xml b/grc/data/platforms/python/blocks/blks2_nbfm_tx.xml
index 3aa7ede0e..3aa7ede0e 100644
--- a/grc/data/grc_gnuradio/blocks/blks2_nbfm_tx.xml
+++ b/grc/data/platforms/python/blocks/blks2_nbfm_tx.xml
diff --git a/grc/data/grc_gnuradio/blocks/blks2_packet_decoder.xml b/grc/data/platforms/python/blocks/blks2_packet_decoder.xml
index d360bc177..d360bc177 100644
--- a/grc/data/grc_gnuradio/blocks/blks2_packet_decoder.xml
+++ b/grc/data/platforms/python/blocks/blks2_packet_decoder.xml
diff --git a/grc/data/grc_gnuradio/blocks/blks2_packet_encoder.xml b/grc/data/platforms/python/blocks/blks2_packet_encoder.xml
index ea9927225..ea9927225 100644
--- a/grc/data/grc_gnuradio/blocks/blks2_packet_encoder.xml
+++ b/grc/data/platforms/python/blocks/blks2_packet_encoder.xml
diff --git a/grc/data/grc_gnuradio/blocks/blks2_qamx_demod.xml b/grc/data/platforms/python/blocks/blks2_qamx_demod.xml
index 93dbe4bb0..93dbe4bb0 100644
--- a/grc/data/grc_gnuradio/blocks/blks2_qamx_demod.xml
+++ b/grc/data/platforms/python/blocks/blks2_qamx_demod.xml
diff --git a/grc/data/grc_gnuradio/blocks/blks2_qamx_mod.xml b/grc/data/platforms/python/blocks/blks2_qamx_mod.xml
index 25a9fb240..25a9fb240 100644
--- a/grc/data/grc_gnuradio/blocks/blks2_qamx_mod.xml
+++ b/grc/data/platforms/python/blocks/blks2_qamx_mod.xml
diff --git a/grc/data/grc_gnuradio/blocks/blks2_rational_resampler_xxx.xml b/grc/data/platforms/python/blocks/blks2_rational_resampler_xxx.xml
index 2f81a50e5..2f81a50e5 100644
--- a/grc/data/grc_gnuradio/blocks/blks2_rational_resampler_xxx.xml
+++ b/grc/data/platforms/python/blocks/blks2_rational_resampler_xxx.xml
diff --git a/grc/data/grc_gnuradio/blocks/blks2_selector.xml b/grc/data/platforms/python/blocks/blks2_selector.xml
index 457f8695e..457f8695e 100644
--- a/grc/data/grc_gnuradio/blocks/blks2_selector.xml
+++ b/grc/data/platforms/python/blocks/blks2_selector.xml
diff --git a/grc/data/grc_gnuradio/blocks/blks2_standard_squelch.xml b/grc/data/platforms/python/blocks/blks2_standard_squelch.xml
index fa32c6c31..fa32c6c31 100644
--- a/grc/data/grc_gnuradio/blocks/blks2_standard_squelch.xml
+++ b/grc/data/platforms/python/blocks/blks2_standard_squelch.xml
diff --git a/grc/data/grc_gnuradio/blocks/blks2_stream_to_vector_decimator.xml b/grc/data/platforms/python/blocks/blks2_stream_to_vector_decimator.xml
index 25f8f7a62..25f8f7a62 100644
--- a/grc/data/grc_gnuradio/blocks/blks2_stream_to_vector_decimator.xml
+++ b/grc/data/platforms/python/blocks/blks2_stream_to_vector_decimator.xml
diff --git a/grc/data/grc_gnuradio/blocks/blks2_synthesis_filterbank.xml b/grc/data/platforms/python/blocks/blks2_synthesis_filterbank.xml
index 5979ed3f7..5979ed3f7 100644
--- a/grc/data/grc_gnuradio/blocks/blks2_synthesis_filterbank.xml
+++ b/grc/data/platforms/python/blocks/blks2_synthesis_filterbank.xml
diff --git a/grc/data/grc_gnuradio/blocks/blks2_valve.xml b/grc/data/platforms/python/blocks/blks2_valve.xml
index 47c553523..47c553523 100644
--- a/grc/data/grc_gnuradio/blocks/blks2_valve.xml
+++ b/grc/data/platforms/python/blocks/blks2_valve.xml
diff --git a/grc/data/grc_gnuradio/blocks/blks2_wfm_rcv.xml b/grc/data/platforms/python/blocks/blks2_wfm_rcv.xml
index 37fb3ba8c..37fb3ba8c 100644
--- a/grc/data/grc_gnuradio/blocks/blks2_wfm_rcv.xml
+++ b/grc/data/platforms/python/blocks/blks2_wfm_rcv.xml
diff --git a/grc/data/grc_gnuradio/blocks/blks2_wfm_rcv_pll.xml b/grc/data/platforms/python/blocks/blks2_wfm_rcv_pll.xml
index 3563a1f2a..3563a1f2a 100644
--- a/grc/data/grc_gnuradio/blocks/blks2_wfm_rcv_pll.xml
+++ b/grc/data/platforms/python/blocks/blks2_wfm_rcv_pll.xml
diff --git a/grc/data/grc_gnuradio/blocks/blks2_wfm_tx.xml b/grc/data/platforms/python/blocks/blks2_wfm_tx.xml
index cff92d819..cff92d819 100644
--- a/grc/data/grc_gnuradio/blocks/blks2_wfm_tx.xml
+++ b/grc/data/platforms/python/blocks/blks2_wfm_tx.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_add_const_vxx.xml b/grc/data/platforms/python/blocks/gr_add_const_vxx.xml
index 9f1c545ab..9f1c545ab 100644
--- a/grc/data/grc_gnuradio/blocks/gr_add_const_vxx.xml
+++ b/grc/data/platforms/python/blocks/gr_add_const_vxx.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_add_vxx.xml b/grc/data/platforms/python/blocks/gr_add_vxx.xml
index 479cdaae4..479cdaae4 100644
--- a/grc/data/grc_gnuradio/blocks/gr_add_vxx.xml
+++ b/grc/data/platforms/python/blocks/gr_add_vxx.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_agc2_xx.xml b/grc/data/platforms/python/blocks/gr_agc2_xx.xml
index fb3ae5704..fb3ae5704 100644
--- a/grc/data/grc_gnuradio/blocks/gr_agc2_xx.xml
+++ b/grc/data/platforms/python/blocks/gr_agc2_xx.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_agc_xx.xml b/grc/data/platforms/python/blocks/gr_agc_xx.xml
index c87d239ed..c87d239ed 100644
--- a/grc/data/grc_gnuradio/blocks/gr_agc_xx.xml
+++ b/grc/data/platforms/python/blocks/gr_agc_xx.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_and_xx.xml b/grc/data/platforms/python/blocks/gr_and_xx.xml
index 9ed006090..9ed006090 100644
--- a/grc/data/grc_gnuradio/blocks/gr_and_xx.xml
+++ b/grc/data/platforms/python/blocks/gr_and_xx.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_argmax_xx.xml b/grc/data/platforms/python/blocks/gr_argmax_xx.xml
index e3e4e3ead..e3e4e3ead 100644
--- a/grc/data/grc_gnuradio/blocks/gr_argmax_xx.xml
+++ b/grc/data/platforms/python/blocks/gr_argmax_xx.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_binary_slicer_fb.xml b/grc/data/platforms/python/blocks/gr_binary_slicer_fb.xml
index 85d71e709..85d71e709 100644
--- a/grc/data/grc_gnuradio/blocks/gr_binary_slicer_fb.xml
+++ b/grc/data/platforms/python/blocks/gr_binary_slicer_fb.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_char_to_float.xml b/grc/data/platforms/python/blocks/gr_char_to_float.xml
index 9ab778051..9ab778051 100644
--- a/grc/data/grc_gnuradio/blocks/gr_char_to_float.xml
+++ b/grc/data/platforms/python/blocks/gr_char_to_float.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_chunks_to_symbols.xml b/grc/data/platforms/python/blocks/gr_chunks_to_symbols.xml
index b54e710ef..b54e710ef 100644
--- a/grc/data/grc_gnuradio/blocks/gr_chunks_to_symbols.xml
+++ b/grc/data/platforms/python/blocks/gr_chunks_to_symbols.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_clock_recovery_mm_xx.xml b/grc/data/platforms/python/blocks/gr_clock_recovery_mm_xx.xml
index 613cc23bf..613cc23bf 100644
--- a/grc/data/grc_gnuradio/blocks/gr_clock_recovery_mm_xx.xml
+++ b/grc/data/platforms/python/blocks/gr_clock_recovery_mm_xx.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_cma_equalizer_cc.xml b/grc/data/platforms/python/blocks/gr_cma_equalizer_cc.xml
index 142fb6d81..142fb6d81 100644
--- a/grc/data/grc_gnuradio/blocks/gr_cma_equalizer_cc.xml
+++ b/grc/data/platforms/python/blocks/gr_cma_equalizer_cc.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_complex_to_arg.xml b/grc/data/platforms/python/blocks/gr_complex_to_arg.xml
index a7bbacd74..a7bbacd74 100644
--- a/grc/data/grc_gnuradio/blocks/gr_complex_to_arg.xml
+++ b/grc/data/platforms/python/blocks/gr_complex_to_arg.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_complex_to_float.xml b/grc/data/platforms/python/blocks/gr_complex_to_float.xml
index 5b02c3d34..5b02c3d34 100644
--- a/grc/data/grc_gnuradio/blocks/gr_complex_to_float.xml
+++ b/grc/data/platforms/python/blocks/gr_complex_to_float.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_complex_to_imag.xml b/grc/data/platforms/python/blocks/gr_complex_to_imag.xml
index 7c120eedd..7c120eedd 100644
--- a/grc/data/grc_gnuradio/blocks/gr_complex_to_imag.xml
+++ b/grc/data/platforms/python/blocks/gr_complex_to_imag.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_complex_to_interleaved_short.xml b/grc/data/platforms/python/blocks/gr_complex_to_interleaved_short.xml
index 5e999599a..5e999599a 100644
--- a/grc/data/grc_gnuradio/blocks/gr_complex_to_interleaved_short.xml
+++ b/grc/data/platforms/python/blocks/gr_complex_to_interleaved_short.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_complex_to_mag.xml b/grc/data/platforms/python/blocks/gr_complex_to_mag.xml
index adc95f207..adc95f207 100644
--- a/grc/data/grc_gnuradio/blocks/gr_complex_to_mag.xml
+++ b/grc/data/platforms/python/blocks/gr_complex_to_mag.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_complex_to_mag_squared.xml b/grc/data/platforms/python/blocks/gr_complex_to_mag_squared.xml
index cd23bfb5c..cd23bfb5c 100644
--- a/grc/data/grc_gnuradio/blocks/gr_complex_to_mag_squared.xml
+++ b/grc/data/platforms/python/blocks/gr_complex_to_mag_squared.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_complex_to_real.xml b/grc/data/platforms/python/blocks/gr_complex_to_real.xml
index ae9ec7b14..ae9ec7b14 100644
--- a/grc/data/grc_gnuradio/blocks/gr_complex_to_real.xml
+++ b/grc/data/platforms/python/blocks/gr_complex_to_real.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_conjugate_cc.xml b/grc/data/platforms/python/blocks/gr_conjugate_cc.xml
index 0b4deb347..0b4deb347 100644
--- a/grc/data/grc_gnuradio/blocks/gr_conjugate_cc.xml
+++ b/grc/data/platforms/python/blocks/gr_conjugate_cc.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_constellation_decoder_cb.xml b/grc/data/platforms/python/blocks/gr_constellation_decoder_cb.xml
index 99d897a3a..99d897a3a 100644
--- a/grc/data/grc_gnuradio/blocks/gr_constellation_decoder_cb.xml
+++ b/grc/data/platforms/python/blocks/gr_constellation_decoder_cb.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_correlate_access_code_bb.xml b/grc/data/platforms/python/blocks/gr_correlate_access_code_bb.xml
index e13d2d070..e13d2d070 100644
--- a/grc/data/grc_gnuradio/blocks/gr_correlate_access_code_bb.xml
+++ b/grc/data/platforms/python/blocks/gr_correlate_access_code_bb.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_costas_loop_cc.xml b/grc/data/platforms/python/blocks/gr_costas_loop_cc.xml
index e0db8bc5d..e0db8bc5d 100644
--- a/grc/data/grc_gnuradio/blocks/gr_costas_loop_cc.xml
+++ b/grc/data/platforms/python/blocks/gr_costas_loop_cc.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_cpfsk_bc.xml b/grc/data/platforms/python/blocks/gr_cpfsk_bc.xml
index 12450b0c3..12450b0c3 100644
--- a/grc/data/grc_gnuradio/blocks/gr_cpfsk_bc.xml
+++ b/grc/data/platforms/python/blocks/gr_cpfsk_bc.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_dd_mpsk_sync_cc.xml b/grc/data/platforms/python/blocks/gr_dd_mpsk_sync_cc.xml
index aed0e8d31..aed0e8d31 100644
--- a/grc/data/grc_gnuradio/blocks/gr_dd_mpsk_sync_cc.xml
+++ b/grc/data/platforms/python/blocks/gr_dd_mpsk_sync_cc.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_decode_ccsds_27_fb.xml b/grc/data/platforms/python/blocks/gr_decode_ccsds_27_fb.xml
index 03b31db83..03b31db83 100644
--- a/grc/data/grc_gnuradio/blocks/gr_decode_ccsds_27_fb.xml
+++ b/grc/data/platforms/python/blocks/gr_decode_ccsds_27_fb.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_deinterleave.xml b/grc/data/platforms/python/blocks/gr_deinterleave.xml
index a7482978c..a7482978c 100644
--- a/grc/data/grc_gnuradio/blocks/gr_deinterleave.xml
+++ b/grc/data/platforms/python/blocks/gr_deinterleave.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_delay.xml b/grc/data/platforms/python/blocks/gr_delay.xml
index b9d429798..b9d429798 100644
--- a/grc/data/grc_gnuradio/blocks/gr_delay.xml
+++ b/grc/data/platforms/python/blocks/gr_delay.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_diff_decoder_bb.xml b/grc/data/platforms/python/blocks/gr_diff_decoder_bb.xml
index ea7cf1734..ea7cf1734 100644
--- a/grc/data/grc_gnuradio/blocks/gr_diff_decoder_bb.xml
+++ b/grc/data/platforms/python/blocks/gr_diff_decoder_bb.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_diff_encoder_bb.xml b/grc/data/platforms/python/blocks/gr_diff_encoder_bb.xml
index 21241eac2..21241eac2 100644
--- a/grc/data/grc_gnuradio/blocks/gr_diff_encoder_bb.xml
+++ b/grc/data/platforms/python/blocks/gr_diff_encoder_bb.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_diff_phasor_cc.xml b/grc/data/platforms/python/blocks/gr_diff_phasor_cc.xml
index 2b2d7e372..2b2d7e372 100644
--- a/grc/data/grc_gnuradio/blocks/gr_diff_phasor_cc.xml
+++ b/grc/data/platforms/python/blocks/gr_diff_phasor_cc.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_divide_xx.xml b/grc/data/platforms/python/blocks/gr_divide_xx.xml
index 7f8752919..7f8752919 100644
--- a/grc/data/grc_gnuradio/blocks/gr_divide_xx.xml
+++ b/grc/data/platforms/python/blocks/gr_divide_xx.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_dpll_bb.xml b/grc/data/platforms/python/blocks/gr_dpll_bb.xml
index 044d398ff..044d398ff 100644
--- a/grc/data/grc_gnuradio/blocks/gr_dpll_bb.xml
+++ b/grc/data/platforms/python/blocks/gr_dpll_bb.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_encode_ccsds_27_bb.xml b/grc/data/platforms/python/blocks/gr_encode_ccsds_27_bb.xml
index f31e6b6c8..f31e6b6c8 100644
--- a/grc/data/grc_gnuradio/blocks/gr_encode_ccsds_27_bb.xml
+++ b/grc/data/platforms/python/blocks/gr_encode_ccsds_27_bb.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_feedforward_agc_cc.xml b/grc/data/platforms/python/blocks/gr_feedforward_agc_cc.xml
index 24e80953f..24e80953f 100644
--- a/grc/data/grc_gnuradio/blocks/gr_feedforward_agc_cc.xml
+++ b/grc/data/platforms/python/blocks/gr_feedforward_agc_cc.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_fft_filter_xxx.xml b/grc/data/platforms/python/blocks/gr_fft_filter_xxx.xml
index c1633094b..c1633094b 100644
--- a/grc/data/grc_gnuradio/blocks/gr_fft_filter_xxx.xml
+++ b/grc/data/platforms/python/blocks/gr_fft_filter_xxx.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_fft_vxx.xml b/grc/data/platforms/python/blocks/gr_fft_vxx.xml
index c2c13d0ae..c2c13d0ae 100644
--- a/grc/data/grc_gnuradio/blocks/gr_fft_vxx.xml
+++ b/grc/data/platforms/python/blocks/gr_fft_vxx.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_file_sink.xml b/grc/data/platforms/python/blocks/gr_file_sink.xml
index 880dc2759..880dc2759 100644
--- a/grc/data/grc_gnuradio/blocks/gr_file_sink.xml
+++ b/grc/data/platforms/python/blocks/gr_file_sink.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_file_source.xml b/grc/data/platforms/python/blocks/gr_file_source.xml
index fcc7a7040..fcc7a7040 100644
--- a/grc/data/grc_gnuradio/blocks/gr_file_source.xml
+++ b/grc/data/platforms/python/blocks/gr_file_source.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_filter_delay_fc.xml b/grc/data/platforms/python/blocks/gr_filter_delay_fc.xml
index 30d65bf82..30d65bf82 100644
--- a/grc/data/grc_gnuradio/blocks/gr_filter_delay_fc.xml
+++ b/grc/data/platforms/python/blocks/gr_filter_delay_fc.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_fir_filter_xxx.xml b/grc/data/platforms/python/blocks/gr_fir_filter_xxx.xml
index c4de8f539..c4de8f539 100644
--- a/grc/data/grc_gnuradio/blocks/gr_fir_filter_xxx.xml
+++ b/grc/data/platforms/python/blocks/gr_fir_filter_xxx.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_float_to_char.xml b/grc/data/platforms/python/blocks/gr_float_to_char.xml
index 5714130ac..5714130ac 100644
--- a/grc/data/grc_gnuradio/blocks/gr_float_to_char.xml
+++ b/grc/data/platforms/python/blocks/gr_float_to_char.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_float_to_complex.xml b/grc/data/platforms/python/blocks/gr_float_to_complex.xml
index e8734fc6a..e8734fc6a 100644
--- a/grc/data/grc_gnuradio/blocks/gr_float_to_complex.xml
+++ b/grc/data/platforms/python/blocks/gr_float_to_complex.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_float_to_short.xml b/grc/data/platforms/python/blocks/gr_float_to_short.xml
index cb2bcd4be..cb2bcd4be 100644
--- a/grc/data/grc_gnuradio/blocks/gr_float_to_short.xml
+++ b/grc/data/platforms/python/blocks/gr_float_to_short.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_float_to_uchar.xml b/grc/data/platforms/python/blocks/gr_float_to_uchar.xml
index aa804d7d9..aa804d7d9 100644
--- a/grc/data/grc_gnuradio/blocks/gr_float_to_uchar.xml
+++ b/grc/data/platforms/python/blocks/gr_float_to_uchar.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_fractional_interpolator_xx.xml b/grc/data/platforms/python/blocks/gr_fractional_interpolator_xx.xml
index 8d65ff8bf..8d65ff8bf 100644
--- a/grc/data/grc_gnuradio/blocks/gr_fractional_interpolator_xx.xml
+++ b/grc/data/platforms/python/blocks/gr_fractional_interpolator_xx.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_freq_xlating_fir_filter_xxx.xml b/grc/data/platforms/python/blocks/gr_freq_xlating_fir_filter_xxx.xml
index e3ee66977..e3ee66977 100644
--- a/grc/data/grc_gnuradio/blocks/gr_freq_xlating_fir_filter_xxx.xml
+++ b/grc/data/platforms/python/blocks/gr_freq_xlating_fir_filter_xxx.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_frequency_modulator_fc.xml b/grc/data/platforms/python/blocks/gr_frequency_modulator_fc.xml
index f18d9f1e1..f18d9f1e1 100644
--- a/grc/data/grc_gnuradio/blocks/gr_frequency_modulator_fc.xml
+++ b/grc/data/platforms/python/blocks/gr_frequency_modulator_fc.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_glfsr_source_x.xml b/grc/data/platforms/python/blocks/gr_glfsr_source_x.xml
index 88fb66797..88fb66797 100644
--- a/grc/data/grc_gnuradio/blocks/gr_glfsr_source_x.xml
+++ b/grc/data/platforms/python/blocks/gr_glfsr_source_x.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_goertzel_fc.xml b/grc/data/platforms/python/blocks/gr_goertzel_fc.xml
index 2105445d1..2105445d1 100644
--- a/grc/data/grc_gnuradio/blocks/gr_goertzel_fc.xml
+++ b/grc/data/platforms/python/blocks/gr_goertzel_fc.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_head.xml b/grc/data/platforms/python/blocks/gr_head.xml
index e5ff7f6aa..e5ff7f6aa 100644
--- a/grc/data/grc_gnuradio/blocks/gr_head.xml
+++ b/grc/data/platforms/python/blocks/gr_head.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_hilbert_fc.xml b/grc/data/platforms/python/blocks/gr_hilbert_fc.xml
index 165e8da23..165e8da23 100644
--- a/grc/data/grc_gnuradio/blocks/gr_hilbert_fc.xml
+++ b/grc/data/platforms/python/blocks/gr_hilbert_fc.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_iir_filter_ffd.xml b/grc/data/platforms/python/blocks/gr_iir_filter_ffd.xml
index 9799150e8..9799150e8 100644
--- a/grc/data/grc_gnuradio/blocks/gr_iir_filter_ffd.xml
+++ b/grc/data/platforms/python/blocks/gr_iir_filter_ffd.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_integrate_xx.xml b/grc/data/platforms/python/blocks/gr_integrate_xx.xml
index d0ebd42e2..d0ebd42e2 100644
--- a/grc/data/grc_gnuradio/blocks/gr_integrate_xx.xml
+++ b/grc/data/platforms/python/blocks/gr_integrate_xx.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_interleave.xml b/grc/data/platforms/python/blocks/gr_interleave.xml
index 3db16ab55..3db16ab55 100644
--- a/grc/data/grc_gnuradio/blocks/gr_interleave.xml
+++ b/grc/data/platforms/python/blocks/gr_interleave.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_interleaved_short_to_complex.xml b/grc/data/platforms/python/blocks/gr_interleaved_short_to_complex.xml
index e3023e499..e3023e499 100644
--- a/grc/data/grc_gnuradio/blocks/gr_interleaved_short_to_complex.xml
+++ b/grc/data/platforms/python/blocks/gr_interleaved_short_to_complex.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_interp_fir_filter_xxx.xml b/grc/data/platforms/python/blocks/gr_interp_fir_filter_xxx.xml
index 55375ae02..55375ae02 100644
--- a/grc/data/grc_gnuradio/blocks/gr_interp_fir_filter_xxx.xml
+++ b/grc/data/platforms/python/blocks/gr_interp_fir_filter_xxx.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_iqcomp_cc.xml b/grc/data/platforms/python/blocks/gr_iqcomp_cc.xml
index 1603bdc42..1603bdc42 100644
--- a/grc/data/grc_gnuradio/blocks/gr_iqcomp_cc.xml
+++ b/grc/data/platforms/python/blocks/gr_iqcomp_cc.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_keep_one_in_n.xml b/grc/data/platforms/python/blocks/gr_keep_one_in_n.xml
index 21595b755..21595b755 100644
--- a/grc/data/grc_gnuradio/blocks/gr_keep_one_in_n.xml
+++ b/grc/data/platforms/python/blocks/gr_keep_one_in_n.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_kludge_copy.xml b/grc/data/platforms/python/blocks/gr_kludge_copy.xml
index 3c817c572..3c817c572 100644
--- a/grc/data/grc_gnuradio/blocks/gr_kludge_copy.xml
+++ b/grc/data/platforms/python/blocks/gr_kludge_copy.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_map_bb.xml b/grc/data/platforms/python/blocks/gr_map_bb.xml
index 20d6bd2b4..20d6bd2b4 100644
--- a/grc/data/grc_gnuradio/blocks/gr_map_bb.xml
+++ b/grc/data/platforms/python/blocks/gr_map_bb.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_max_xx.xml b/grc/data/platforms/python/blocks/gr_max_xx.xml
index 9dbbe60e5..9dbbe60e5 100644
--- a/grc/data/grc_gnuradio/blocks/gr_max_xx.xml
+++ b/grc/data/platforms/python/blocks/gr_max_xx.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_moving_average_xx.xml b/grc/data/platforms/python/blocks/gr_moving_average_xx.xml
index 2c3be4033..2c3be4033 100644
--- a/grc/data/grc_gnuradio/blocks/gr_moving_average_xx.xml
+++ b/grc/data/platforms/python/blocks/gr_moving_average_xx.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_mpsk_receiver_cc.xml b/grc/data/platforms/python/blocks/gr_mpsk_receiver_cc.xml
index 843c3a4c1..843c3a4c1 100644
--- a/grc/data/grc_gnuradio/blocks/gr_mpsk_receiver_cc.xml
+++ b/grc/data/platforms/python/blocks/gr_mpsk_receiver_cc.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_mpsk_sync_cc.xml b/grc/data/platforms/python/blocks/gr_mpsk_sync_cc.xml
index fd08f8340..fd08f8340 100644
--- a/grc/data/grc_gnuradio/blocks/gr_mpsk_sync_cc.xml
+++ b/grc/data/platforms/python/blocks/gr_mpsk_sync_cc.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_multiply_const_vxx.xml b/grc/data/platforms/python/blocks/gr_multiply_const_vxx.xml
index 1309d75cd..1309d75cd 100644
--- a/grc/data/grc_gnuradio/blocks/gr_multiply_const_vxx.xml
+++ b/grc/data/platforms/python/blocks/gr_multiply_const_vxx.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_multiply_vxx.xml b/grc/data/platforms/python/blocks/gr_multiply_vxx.xml
index ea0d555b6..ea0d555b6 100644
--- a/grc/data/grc_gnuradio/blocks/gr_multiply_vxx.xml
+++ b/grc/data/platforms/python/blocks/gr_multiply_vxx.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_mute_xx.xml b/grc/data/platforms/python/blocks/gr_mute_xx.xml
index 668d7c599..668d7c599 100644
--- a/grc/data/grc_gnuradio/blocks/gr_mute_xx.xml
+++ b/grc/data/platforms/python/blocks/gr_mute_xx.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_nlog10_ff.xml b/grc/data/platforms/python/blocks/gr_nlog10_ff.xml
index 935078236..935078236 100644
--- a/grc/data/grc_gnuradio/blocks/gr_nlog10_ff.xml
+++ b/grc/data/platforms/python/blocks/gr_nlog10_ff.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_noise_source_x.xml b/grc/data/platforms/python/blocks/gr_noise_source_x.xml
index 664a108d3..664a108d3 100644
--- a/grc/data/grc_gnuradio/blocks/gr_noise_source_x.xml
+++ b/grc/data/platforms/python/blocks/gr_noise_source_x.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_nop.xml b/grc/data/platforms/python/blocks/gr_nop.xml
index 127a78a55..127a78a55 100644
--- a/grc/data/grc_gnuradio/blocks/gr_nop.xml
+++ b/grc/data/platforms/python/blocks/gr_nop.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_not_xx.xml b/grc/data/platforms/python/blocks/gr_not_xx.xml
index 7af7e4b6b..7af7e4b6b 100644
--- a/grc/data/grc_gnuradio/blocks/gr_not_xx.xml
+++ b/grc/data/platforms/python/blocks/gr_not_xx.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_null_sink.xml b/grc/data/platforms/python/blocks/gr_null_sink.xml
index ed106b495..ed106b495 100644
--- a/grc/data/grc_gnuradio/blocks/gr_null_sink.xml
+++ b/grc/data/platforms/python/blocks/gr_null_sink.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_null_source.xml b/grc/data/platforms/python/blocks/gr_null_source.xml
index 6132eae3c..6132eae3c 100644
--- a/grc/data/grc_gnuradio/blocks/gr_null_source.xml
+++ b/grc/data/platforms/python/blocks/gr_null_source.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_or_xx.xml b/grc/data/platforms/python/blocks/gr_or_xx.xml
index b374aa22a..b374aa22a 100644
--- a/grc/data/grc_gnuradio/blocks/gr_or_xx.xml
+++ b/grc/data/platforms/python/blocks/gr_or_xx.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_packed_to_unpacked_xx.xml b/grc/data/platforms/python/blocks/gr_packed_to_unpacked_xx.xml
index 5fd9729a4..5fd9729a4 100644
--- a/grc/data/grc_gnuradio/blocks/gr_packed_to_unpacked_xx.xml
+++ b/grc/data/platforms/python/blocks/gr_packed_to_unpacked_xx.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_peak_detector2_fb.xml b/grc/data/platforms/python/blocks/gr_peak_detector2_fb.xml
index 6c496da77..6c496da77 100644
--- a/grc/data/grc_gnuradio/blocks/gr_peak_detector2_fb.xml
+++ b/grc/data/platforms/python/blocks/gr_peak_detector2_fb.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_peak_detector_xb.xml b/grc/data/platforms/python/blocks/gr_peak_detector_xb.xml
index 394b0697f..394b0697f 100644
--- a/grc/data/grc_gnuradio/blocks/gr_peak_detector_xb.xml
+++ b/grc/data/platforms/python/blocks/gr_peak_detector_xb.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_phase_modulator_fc.xml b/grc/data/platforms/python/blocks/gr_phase_modulator_fc.xml
index 758c50863..758c50863 100644
--- a/grc/data/grc_gnuradio/blocks/gr_phase_modulator_fc.xml
+++ b/grc/data/platforms/python/blocks/gr_phase_modulator_fc.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_pll_carriertracking_cc.xml b/grc/data/platforms/python/blocks/gr_pll_carriertracking_cc.xml
index 5b876b259..5b876b259 100644
--- a/grc/data/grc_gnuradio/blocks/gr_pll_carriertracking_cc.xml
+++ b/grc/data/platforms/python/blocks/gr_pll_carriertracking_cc.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_pll_freqdet_cf.xml b/grc/data/platforms/python/blocks/gr_pll_freqdet_cf.xml
index 8ec1fb3bb..8ec1fb3bb 100644
--- a/grc/data/grc_gnuradio/blocks/gr_pll_freqdet_cf.xml
+++ b/grc/data/platforms/python/blocks/gr_pll_freqdet_cf.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_pll_refout_cc.xml b/grc/data/platforms/python/blocks/gr_pll_refout_cc.xml
index 64cf2bfb6..64cf2bfb6 100644
--- a/grc/data/grc_gnuradio/blocks/gr_pll_refout_cc.xml
+++ b/grc/data/platforms/python/blocks/gr_pll_refout_cc.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_pn_correlator_cc.xml b/grc/data/platforms/python/blocks/gr_pn_correlator_cc.xml
index 094f46cdf..094f46cdf 100644
--- a/grc/data/grc_gnuradio/blocks/gr_pn_correlator_cc.xml
+++ b/grc/data/platforms/python/blocks/gr_pn_correlator_cc.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_pwr_squelch_xx.xml b/grc/data/platforms/python/blocks/gr_pwr_squelch_xx.xml
index 08d621177..08d621177 100644
--- a/grc/data/grc_gnuradio/blocks/gr_pwr_squelch_xx.xml
+++ b/grc/data/platforms/python/blocks/gr_pwr_squelch_xx.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_quadrature_demod_cf.xml b/grc/data/platforms/python/blocks/gr_quadrature_demod_cf.xml
index a0e630c7e..a0e630c7e 100644
--- a/grc/data/grc_gnuradio/blocks/gr_quadrature_demod_cf.xml
+++ b/grc/data/platforms/python/blocks/gr_quadrature_demod_cf.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_rational_resampler_base_xxx.xml b/grc/data/platforms/python/blocks/gr_rational_resampler_base_xxx.xml
index 4b7720173..4b7720173 100644
--- a/grc/data/grc_gnuradio/blocks/gr_rational_resampler_base_xxx.xml
+++ b/grc/data/platforms/python/blocks/gr_rational_resampler_base_xxx.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_repeat.xml b/grc/data/platforms/python/blocks/gr_repeat.xml
index ba652a4d7..ba652a4d7 100644
--- a/grc/data/grc_gnuradio/blocks/gr_repeat.xml
+++ b/grc/data/platforms/python/blocks/gr_repeat.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_rms_xx.xml b/grc/data/platforms/python/blocks/gr_rms_xx.xml
index 1e0947192..1e0947192 100644
--- a/grc/data/grc_gnuradio/blocks/gr_rms_xx.xml
+++ b/grc/data/platforms/python/blocks/gr_rms_xx.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_sample_and_hold_xx.xml b/grc/data/platforms/python/blocks/gr_sample_and_hold_xx.xml
index bfe66bb00..bfe66bb00 100644
--- a/grc/data/grc_gnuradio/blocks/gr_sample_and_hold_xx.xml
+++ b/grc/data/platforms/python/blocks/gr_sample_and_hold_xx.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_short_to_float.xml b/grc/data/platforms/python/blocks/gr_short_to_float.xml
index 8dac97c09..8dac97c09 100644
--- a/grc/data/grc_gnuradio/blocks/gr_short_to_float.xml
+++ b/grc/data/platforms/python/blocks/gr_short_to_float.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_sig_source_x.xml b/grc/data/platforms/python/blocks/gr_sig_source_x.xml
index 7ad0c20a4..7ad0c20a4 100644
--- a/grc/data/grc_gnuradio/blocks/gr_sig_source_x.xml
+++ b/grc/data/platforms/python/blocks/gr_sig_source_x.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_simple_correlator.xml b/grc/data/platforms/python/blocks/gr_simple_correlator.xml
index 820523a64..820523a64 100644
--- a/grc/data/grc_gnuradio/blocks/gr_simple_correlator.xml
+++ b/grc/data/platforms/python/blocks/gr_simple_correlator.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_simple_framer.xml b/grc/data/platforms/python/blocks/gr_simple_framer.xml
index 2a0295c41..2a0295c41 100644
--- a/grc/data/grc_gnuradio/blocks/gr_simple_framer.xml
+++ b/grc/data/platforms/python/blocks/gr_simple_framer.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_simple_squelch_cc.xml b/grc/data/platforms/python/blocks/gr_simple_squelch_cc.xml
index 5c0727f5f..5c0727f5f 100644
--- a/grc/data/grc_gnuradio/blocks/gr_simple_squelch_cc.xml
+++ b/grc/data/platforms/python/blocks/gr_simple_squelch_cc.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_single_pole_iir_filter_xx.xml b/grc/data/platforms/python/blocks/gr_single_pole_iir_filter_xx.xml
index 50cf4a82d..50cf4a82d 100644
--- a/grc/data/grc_gnuradio/blocks/gr_single_pole_iir_filter_xx.xml
+++ b/grc/data/platforms/python/blocks/gr_single_pole_iir_filter_xx.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_skiphead.xml b/grc/data/platforms/python/blocks/gr_skiphead.xml
index 0849ad298..0849ad298 100644
--- a/grc/data/grc_gnuradio/blocks/gr_skiphead.xml
+++ b/grc/data/platforms/python/blocks/gr_skiphead.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_stream_to_streams.xml b/grc/data/platforms/python/blocks/gr_stream_to_streams.xml
index 82542b8d4..82542b8d4 100644
--- a/grc/data/grc_gnuradio/blocks/gr_stream_to_streams.xml
+++ b/grc/data/platforms/python/blocks/gr_stream_to_streams.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_stream_to_vector.xml b/grc/data/platforms/python/blocks/gr_stream_to_vector.xml
index 296d786f8..296d786f8 100644
--- a/grc/data/grc_gnuradio/blocks/gr_stream_to_vector.xml
+++ b/grc/data/platforms/python/blocks/gr_stream_to_vector.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_streams_to_stream.xml b/grc/data/platforms/python/blocks/gr_streams_to_stream.xml
index 7aadd7eef..7aadd7eef 100644
--- a/grc/data/grc_gnuradio/blocks/gr_streams_to_stream.xml
+++ b/grc/data/platforms/python/blocks/gr_streams_to_stream.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_streams_to_vector.xml b/grc/data/platforms/python/blocks/gr_streams_to_vector.xml
index 4ecdcb2d4..4ecdcb2d4 100644
--- a/grc/data/grc_gnuradio/blocks/gr_streams_to_vector.xml
+++ b/grc/data/platforms/python/blocks/gr_streams_to_vector.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_sub_xx.xml b/grc/data/platforms/python/blocks/gr_sub_xx.xml
index 488e6c364..488e6c364 100644
--- a/grc/data/grc_gnuradio/blocks/gr_sub_xx.xml
+++ b/grc/data/platforms/python/blocks/gr_sub_xx.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_threshold_ff.xml b/grc/data/platforms/python/blocks/gr_threshold_ff.xml
index 97764d733..97764d733 100644
--- a/grc/data/grc_gnuradio/blocks/gr_threshold_ff.xml
+++ b/grc/data/platforms/python/blocks/gr_threshold_ff.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_throttle.xml b/grc/data/platforms/python/blocks/gr_throttle.xml
index ab8506f55..ab8506f55 100644
--- a/grc/data/grc_gnuradio/blocks/gr_throttle.xml
+++ b/grc/data/platforms/python/blocks/gr_throttle.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_uchar_to_float.xml b/grc/data/platforms/python/blocks/gr_uchar_to_float.xml
index 0a5f7f96a..0a5f7f96a 100644
--- a/grc/data/grc_gnuradio/blocks/gr_uchar_to_float.xml
+++ b/grc/data/platforms/python/blocks/gr_uchar_to_float.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_udp_sink.xml b/grc/data/platforms/python/blocks/gr_udp_sink.xml
index e9f6c2be8..e9f6c2be8 100644
--- a/grc/data/grc_gnuradio/blocks/gr_udp_sink.xml
+++ b/grc/data/platforms/python/blocks/gr_udp_sink.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_udp_source.xml b/grc/data/platforms/python/blocks/gr_udp_source.xml
index f03adf802..f03adf802 100644
--- a/grc/data/grc_gnuradio/blocks/gr_udp_source.xml
+++ b/grc/data/platforms/python/blocks/gr_udp_source.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_unpack_k_bits_bb.xml b/grc/data/platforms/python/blocks/gr_unpack_k_bits_bb.xml
index 9917644ab..9917644ab 100644
--- a/grc/data/grc_gnuradio/blocks/gr_unpack_k_bits_bb.xml
+++ b/grc/data/platforms/python/blocks/gr_unpack_k_bits_bb.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_unpacked_to_packed_xx.xml b/grc/data/platforms/python/blocks/gr_unpacked_to_packed_xx.xml
index f7457eb5c..f7457eb5c 100644
--- a/grc/data/grc_gnuradio/blocks/gr_unpacked_to_packed_xx.xml
+++ b/grc/data/platforms/python/blocks/gr_unpacked_to_packed_xx.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_vco_f.xml b/grc/data/platforms/python/blocks/gr_vco_f.xml
index e49c53965..e49c53965 100644
--- a/grc/data/grc_gnuradio/blocks/gr_vco_f.xml
+++ b/grc/data/platforms/python/blocks/gr_vco_f.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_vector_sink_x.xml b/grc/data/platforms/python/blocks/gr_vector_sink_x.xml
index d901b1d78..d901b1d78 100644
--- a/grc/data/grc_gnuradio/blocks/gr_vector_sink_x.xml
+++ b/grc/data/platforms/python/blocks/gr_vector_sink_x.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_vector_source_x.xml b/grc/data/platforms/python/blocks/gr_vector_source_x.xml
index 240273e42..240273e42 100644
--- a/grc/data/grc_gnuradio/blocks/gr_vector_source_x.xml
+++ b/grc/data/platforms/python/blocks/gr_vector_source_x.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_vector_to_stream.xml b/grc/data/platforms/python/blocks/gr_vector_to_stream.xml
index d56d34067..d56d34067 100644
--- a/grc/data/grc_gnuradio/blocks/gr_vector_to_stream.xml
+++ b/grc/data/platforms/python/blocks/gr_vector_to_stream.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_vector_to_streams.xml b/grc/data/platforms/python/blocks/gr_vector_to_streams.xml
index 86cb56813..86cb56813 100644
--- a/grc/data/grc_gnuradio/blocks/gr_vector_to_streams.xml
+++ b/grc/data/platforms/python/blocks/gr_vector_to_streams.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_wavfile_sink.xml b/grc/data/platforms/python/blocks/gr_wavfile_sink.xml
index f2c8a009f..f2c8a009f 100644
--- a/grc/data/grc_gnuradio/blocks/gr_wavfile_sink.xml
+++ b/grc/data/platforms/python/blocks/gr_wavfile_sink.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_wavfile_source.xml b/grc/data/platforms/python/blocks/gr_wavfile_source.xml
index 433bb0af2..433bb0af2 100644
--- a/grc/data/grc_gnuradio/blocks/gr_wavfile_source.xml
+++ b/grc/data/platforms/python/blocks/gr_wavfile_source.xml
diff --git a/grc/data/grc_gnuradio/blocks/gr_xor_xx.xml b/grc/data/platforms/python/blocks/gr_xor_xx.xml
index c014cbe57..c014cbe57 100644
--- a/grc/data/grc_gnuradio/blocks/gr_xor_xx.xml
+++ b/grc/data/platforms/python/blocks/gr_xor_xx.xml
diff --git a/grc/data/grc_gnuradio/blocks/high_pass_filter.xml b/grc/data/platforms/python/blocks/high_pass_filter.xml
index 0673fd124..0673fd124 100644
--- a/grc/data/grc_gnuradio/blocks/high_pass_filter.xml
+++ b/grc/data/platforms/python/blocks/high_pass_filter.xml
diff --git a/grc/data/grc_gnuradio/blocks/import.xml b/grc/data/platforms/python/blocks/import.xml
index feea052d3..feea052d3 100644
--- a/grc/data/grc_gnuradio/blocks/import.xml
+++ b/grc/data/platforms/python/blocks/import.xml
diff --git a/grc/data/grc_gnuradio/blocks/low_pass_filter.xml b/grc/data/platforms/python/blocks/low_pass_filter.xml
index 1e8802c80..1e8802c80 100644
--- a/grc/data/grc_gnuradio/blocks/low_pass_filter.xml
+++ b/grc/data/platforms/python/blocks/low_pass_filter.xml
diff --git a/grc/data/grc_gnuradio/blocks/note.xml b/grc/data/platforms/python/blocks/note.xml
index db6687c03..db6687c03 100644
--- a/grc/data/grc_gnuradio/blocks/note.xml
+++ b/grc/data/platforms/python/blocks/note.xml
diff --git a/grc/data/grc_gnuradio/blocks/options.xml b/grc/data/platforms/python/blocks/options.xml
index 8e8f06891..8e8f06891 100644
--- a/grc/data/grc_gnuradio/blocks/options.xml
+++ b/grc/data/platforms/python/blocks/options.xml
diff --git a/grc/data/grc_gnuradio/blocks/pad_sink.xml b/grc/data/platforms/python/blocks/pad_sink.xml
index 477f2ad13..477f2ad13 100644
--- a/grc/data/grc_gnuradio/blocks/pad_sink.xml
+++ b/grc/data/platforms/python/blocks/pad_sink.xml
diff --git a/grc/data/grc_gnuradio/blocks/pad_source.xml b/grc/data/platforms/python/blocks/pad_source.xml
index b6ef2c55d..b6ef2c55d 100644
--- a/grc/data/grc_gnuradio/blocks/pad_source.xml
+++ b/grc/data/platforms/python/blocks/pad_source.xml
diff --git a/grc/data/grc_gnuradio/blocks/parameter.xml b/grc/data/platforms/python/blocks/parameter.xml
index b9dcce424..b9dcce424 100644
--- a/grc/data/grc_gnuradio/blocks/parameter.xml
+++ b/grc/data/platforms/python/blocks/parameter.xml
diff --git a/grc/data/grc_gnuradio/blocks/preferences.xml b/grc/data/platforms/python/blocks/preferences.xml
index 51138c123..51138c123 100644
--- a/grc/data/grc_gnuradio/blocks/preferences.xml
+++ b/grc/data/platforms/python/blocks/preferences.xml
diff --git a/grc/data/grc_gnuradio/blocks/random_source_x.xml b/grc/data/platforms/python/blocks/random_source_x.xml
index f04dcd8da..f04dcd8da 100644
--- a/grc/data/grc_gnuradio/blocks/random_source_x.xml
+++ b/grc/data/platforms/python/blocks/random_source_x.xml
diff --git a/grc/data/grc_gnuradio/blocks/trellis_encoder_xx.xml b/grc/data/platforms/python/blocks/trellis_encoder_xx.xml
index 74a8cc346..74a8cc346 100644
--- a/grc/data/grc_gnuradio/blocks/trellis_encoder_xx.xml
+++ b/grc/data/platforms/python/blocks/trellis_encoder_xx.xml
diff --git a/grc/data/grc_gnuradio/blocks/trellis_metrics_x.xml b/grc/data/platforms/python/blocks/trellis_metrics_x.xml
index f09d54f09..f09d54f09 100644
--- a/grc/data/grc_gnuradio/blocks/trellis_metrics_x.xml
+++ b/grc/data/platforms/python/blocks/trellis_metrics_x.xml
diff --git a/grc/data/grc_gnuradio/blocks/trellis_permutation.xml b/grc/data/platforms/python/blocks/trellis_permutation.xml
index 7721cc71d..7721cc71d 100644
--- a/grc/data/grc_gnuradio/blocks/trellis_permutation.xml
+++ b/grc/data/platforms/python/blocks/trellis_permutation.xml
diff --git a/grc/data/grc_gnuradio/blocks/trellis_siso_combined_f.xml b/grc/data/platforms/python/blocks/trellis_siso_combined_f.xml
index 98874d7f4..98874d7f4 100644
--- a/grc/data/grc_gnuradio/blocks/trellis_siso_combined_f.xml
+++ b/grc/data/platforms/python/blocks/trellis_siso_combined_f.xml
diff --git a/grc/data/grc_gnuradio/blocks/trellis_siso_f.xml b/grc/data/platforms/python/blocks/trellis_siso_f.xml
index 2b9cfe5f7..2b9cfe5f7 100644
--- a/grc/data/grc_gnuradio/blocks/trellis_siso_f.xml
+++ b/grc/data/platforms/python/blocks/trellis_siso_f.xml
diff --git a/grc/data/grc_gnuradio/blocks/trellis_viterbi_combined_xx.xml b/grc/data/platforms/python/blocks/trellis_viterbi_combined_xx.xml
index 0a67d0bfc..0a67d0bfc 100644
--- a/grc/data/grc_gnuradio/blocks/trellis_viterbi_combined_xx.xml
+++ b/grc/data/platforms/python/blocks/trellis_viterbi_combined_xx.xml
diff --git a/grc/data/grc_gnuradio/blocks/trellis_viterbi_x.xml b/grc/data/platforms/python/blocks/trellis_viterbi_x.xml
index 7465b11db..7465b11db 100644
--- a/grc/data/grc_gnuradio/blocks/trellis_viterbi_x.xml
+++ b/grc/data/platforms/python/blocks/trellis_viterbi_x.xml
diff --git a/grc/data/grc_gnuradio/blocks/usrp_diagnostics.xml b/grc/data/platforms/python/blocks/usrp_diagnostics.xml
index 52dd885a4..52dd885a4 100644
--- a/grc/data/grc_gnuradio/blocks/usrp_diagnostics.xml
+++ b/grc/data/platforms/python/blocks/usrp_diagnostics.xml
diff --git a/grc/data/grc_gnuradio/blocks/usrp_dual_sink_x.xml b/grc/data/platforms/python/blocks/usrp_dual_sink_x.xml
index acc14b1f6..acc14b1f6 100644
--- a/grc/data/grc_gnuradio/blocks/usrp_dual_sink_x.xml
+++ b/grc/data/platforms/python/blocks/usrp_dual_sink_x.xml
diff --git a/grc/data/grc_gnuradio/blocks/usrp_dual_source_x.xml b/grc/data/platforms/python/blocks/usrp_dual_source_x.xml
index 68526b47e..68526b47e 100644
--- a/grc/data/grc_gnuradio/blocks/usrp_dual_source_x.xml
+++ b/grc/data/platforms/python/blocks/usrp_dual_source_x.xml
diff --git a/grc/data/grc_gnuradio/blocks/usrp_simple_sink_x.xml b/grc/data/platforms/python/blocks/usrp_simple_sink_x.xml
index b525d031f..b525d031f 100644
--- a/grc/data/grc_gnuradio/blocks/usrp_simple_sink_x.xml
+++ b/grc/data/platforms/python/blocks/usrp_simple_sink_x.xml
diff --git a/grc/data/grc_gnuradio/blocks/usrp_simple_source_x.xml b/grc/data/platforms/python/blocks/usrp_simple_source_x.xml
index a1598583f..a1598583f 100644
--- a/grc/data/grc_gnuradio/blocks/usrp_simple_source_x.xml
+++ b/grc/data/platforms/python/blocks/usrp_simple_source_x.xml
diff --git a/grc/data/grc_gnuradio/blocks/variable.xml b/grc/data/platforms/python/blocks/variable.xml
index d620e1607..d620e1607 100644
--- a/grc/data/grc_gnuradio/blocks/variable.xml
+++ b/grc/data/platforms/python/blocks/variable.xml
diff --git a/grc/data/grc_gnuradio/blocks/variable_chooser.xml b/grc/data/platforms/python/blocks/variable_chooser.xml
index 4eba84d4c..4eba84d4c 100644
--- a/grc/data/grc_gnuradio/blocks/variable_chooser.xml
+++ b/grc/data/platforms/python/blocks/variable_chooser.xml
diff --git a/grc/data/grc_gnuradio/blocks/variable_sink.xml b/grc/data/platforms/python/blocks/variable_sink.xml
index 13737b2cf..13737b2cf 100644
--- a/grc/data/grc_gnuradio/blocks/variable_sink.xml
+++ b/grc/data/platforms/python/blocks/variable_sink.xml
diff --git a/grc/data/grc_gnuradio/blocks/variable_slider.xml b/grc/data/platforms/python/blocks/variable_slider.xml
index 2f6374b9a..2f6374b9a 100644
--- a/grc/data/grc_gnuradio/blocks/variable_slider.xml
+++ b/grc/data/platforms/python/blocks/variable_slider.xml
diff --git a/grc/data/grc_gnuradio/blocks/variable_text_box.xml b/grc/data/platforms/python/blocks/variable_text_box.xml
index 0dad3d826..0dad3d826 100644
--- a/grc/data/grc_gnuradio/blocks/variable_text_box.xml
+++ b/grc/data/platforms/python/blocks/variable_text_box.xml
diff --git a/grc/data/grc_gnuradio/blocks/wxgui_constellationsink2.xml b/grc/data/platforms/python/blocks/wxgui_constellationsink2.xml
index cf3f29280..cf3f29280 100644
--- a/grc/data/grc_gnuradio/blocks/wxgui_constellationsink2.xml
+++ b/grc/data/platforms/python/blocks/wxgui_constellationsink2.xml
diff --git a/grc/data/grc_gnuradio/blocks/wxgui_fftsink2.xml b/grc/data/platforms/python/blocks/wxgui_fftsink2.xml
index 68b07ba9d..68b07ba9d 100644
--- a/grc/data/grc_gnuradio/blocks/wxgui_fftsink2.xml
+++ b/grc/data/platforms/python/blocks/wxgui_fftsink2.xml
diff --git a/grc/data/grc_gnuradio/blocks/wxgui_numbersink2.xml b/grc/data/platforms/python/blocks/wxgui_numbersink2.xml
index e54da3e61..e54da3e61 100644
--- a/grc/data/grc_gnuradio/blocks/wxgui_numbersink2.xml
+++ b/grc/data/platforms/python/blocks/wxgui_numbersink2.xml
diff --git a/grc/data/grc_gnuradio/blocks/wxgui_scopesink2.xml b/grc/data/platforms/python/blocks/wxgui_scopesink2.xml
index 7cf49d5d6..7cf49d5d6 100644
--- a/grc/data/grc_gnuradio/blocks/wxgui_scopesink2.xml
+++ b/grc/data/platforms/python/blocks/wxgui_scopesink2.xml
diff --git a/grc/data/grc_gnuradio/blocks/wxgui_waterfallsink2.xml b/grc/data/platforms/python/blocks/wxgui_waterfallsink2.xml
index b5172f094..b5172f094 100644
--- a/grc/data/grc_gnuradio/blocks/wxgui_waterfallsink2.xml
+++ b/grc/data/platforms/python/blocks/wxgui_waterfallsink2.xml
diff --git a/grc/data/grc_gnuradio/blocks/xmlrpc_client.xml b/grc/data/platforms/python/blocks/xmlrpc_client.xml
index 82ae8ceed..82ae8ceed 100644
--- a/grc/data/grc_gnuradio/blocks/xmlrpc_client.xml
+++ b/grc/data/platforms/python/blocks/xmlrpc_client.xml
diff --git a/grc/data/grc_gnuradio/blocks/xmlrpc_server.xml b/grc/data/platforms/python/blocks/xmlrpc_server.xml
index 40e547efc..40e547efc 100644
--- a/grc/data/grc_gnuradio/blocks/xmlrpc_server.xml
+++ b/grc/data/platforms/python/blocks/xmlrpc_server.xml
diff --git a/grc/data/grc_gnuradio/default_flow_graph.grc.xml b/grc/data/platforms/python/default_flow_graph.grc.xml
index dea26f3a5..dea26f3a5 100644
--- a/grc/data/grc_gnuradio/default_flow_graph.grc.xml
+++ b/grc/data/platforms/python/default_flow_graph.grc.xml
diff --git a/grc/data/grc_gnuradio/flow_graph.tmpl b/grc/data/platforms/python/flow_graph.tmpl
index 90ef3bbae..2341ef46f 100644
--- a/grc/data/grc_gnuradio/flow_graph.tmpl
+++ b/grc/data/platforms/python/flow_graph.tmpl
@@ -41,7 +41,8 @@ $imp
 #set $class_name = $flow_graph.get_option('id')
 #set $param_str = ', '.join(['self'] + ['%s=%s'%(param.get_id(), param.get_make()) for param in $parameters])
 #if $generate_options == 'wx_gui'
-	#from grc.Constants import MAIN_WINDOW_PREFIX, DATA_DIR
+	#from gnuradio.grc.platforms.base.Constants import DATA_DIR
+	#from gnuradio.grc.gui.Constants import MAIN_WINDOW_PREFIX
 class $(class_name)(grc_wxgui.top_block_gui):
 
 	def __init__($param_str):