7 files changed, 31 insertions, 50 deletions
diff --git a/gr-blocks/examples/CMakeLists.txt b/gr-blocks/examples/CMakeLists.txt
index 8be56d0b9d..850672e404 100644
--- a/gr-blocks/examples/CMakeLists.txt
+++ b/gr-blocks/examples/CMakeLists.txt
@@ -22,9 +22,8 @@ install(
   matrix_multiplexer.grc
   peak_detector2.grc
   vector_source_with_tags.grc
-  test_stream_mux_tags.grc 
+  test_stream_mux_tags.grc
   DESTINATION ${GR_PKG_DATA_DIR}/examples/blocks
-  COMPONENT "runtime_python"
 )
 
 add_subdirectory(metadata)
diff --git a/gr-blocks/examples/ctrlport/CMakeLists.txt b/gr-blocks/examples/ctrlport/CMakeLists.txt
index 23d2db129f..c9b39bcaaa 100644
--- a/gr-blocks/examples/ctrlport/CMakeLists.txt
+++ b/gr-blocks/examples/ctrlport/CMakeLists.txt
@@ -26,12 +26,10 @@ install(
   simple_copy.grc
   usrp_source_control.grc
   DESTINATION ${GR_PKG_DATA_DIR}/examples/ctrlport
-  COMPONENT "runtime_python"
 )
 
 GR_PYTHON_INSTALL(PROGRAMS
   simple_copy_controller.py
   usrp_source_controller.py
   DESTINATION ${GR_PKG_DATA_DIR}/examples/ctrlport
-  COMPONENT "runtime_python"
 )
diff --git a/gr-blocks/examples/ctrlport/usrp_sink_controller.py b/gr-blocks/examples/ctrlport/usrp_sink_controller.py
index d8c38e36f2..ec687d80e1 100755
--- a/gr-blocks/examples/ctrlport/usrp_sink_controller.py
+++ b/gr-blocks/examples/ctrlport/usrp_sink_controller.py
@@ -3,28 +3,22 @@
 import sys
 import pmt
 from gnuradio.ctrlport.GNURadioControlPortClient import GNURadioControlPortClient
-from optparse import OptionParser
+from argparse import ArgumentParser
 
-parser = OptionParser(usage="%prog: [options]")
-parser.add_option("-H", "--host", type="string", default="localhost",
-                  help="Hostname to connect to (default=%default)")
-parser.add_option("-p", "--port", type="int", default=9090,
-                  help="Port of Controlport instance on host (default=%default)")
-parser.add_option("-a", "--alias", type="string", default="gr uhd usrp sink0",
-                  help="The UHD block's alias to control (default=%default)")
-options, args = parser.parse_args()
-
-if(len(args) < 2):
-    sys.stderr.write('Not enough arguments: usrp_source_controller.py [options] <command> <value>\n')
-    sys.stderr.write('See the "UHD Interface" section of the manual for available commands.\n\n')
-    sys.exit(1)
+parser = ArgumentParser()
+parser.add_argument("-H", "--host", default="localhost",
+                  help="Hostname to connect to (default=%(default)r)")
+parser.add_argument("-p", "--port", type=int, default=9090,
+                  help="Port of Controlport instance on host (default=%(default)r)")
+parser.add_argument("-a", "--alias", default="gr uhd usrp sink0",
+                  help="The UHD block's alias to control (default=%(default)r)")
+parser.add_argument("command", metavar="COMMAND")
+parser.add_argument("value", metavar="VALUE")
+args = parser.parse_args()
 
 port = 'command'
-alias = options.alias
-hostname = options.host
-portnum = options.port
-cmd = args[0]
-val = args[1]
+cmd = args.command
+val = args.value
 
 if(cmd == "tune" or cmd == "time"):
     sys.stderr.write("This application currently does not support the 'tune' or 'time' UHD "
@@ -35,8 +29,8 @@ elif(cmd == "antenna"):
 else:
     val = pmt.from_double(float(val))
 
-argv = [None, hostname, portnum]
+argv = [None, args.host, args.port]
 radiosys = GNURadioControlPortClient(argv=argv, rpcmethod='thrift')
 radio = radiosys.client
 
-radio.postMessage(alias, port, pmt.cons(pmt.intern(cmd), val))
+radio.postMessage(args.alias, port, pmt.cons(pmt.intern(cmd), val))
diff --git a/gr-blocks/examples/ctrlport/usrp_source_controller.py b/gr-blocks/examples/ctrlport/usrp_source_controller.py
index 02d30a9d37..78c5ae66aa 100755
--- a/gr-blocks/examples/ctrlport/usrp_source_controller.py
+++ b/gr-blocks/examples/ctrlport/usrp_source_controller.py
@@ -3,28 +3,22 @@
 import sys
 import pmt
 from gnuradio.ctrlport.GNURadioControlPortClient import GNURadioControlPortClient
-from optparse import OptionParser
+from argparse import ArgumentParser
 
-parser = OptionParser(usage="%prog: [options]")
-parser.add_option("-H", "--host", type="string", default="localhost",
-                  help="Hostname to connect to (default=%default)")
-parser.add_option("-p", "--port", type="int", default=9090,
-                  help="Port of Controlport instance on host (default=%default)")
-parser.add_option("-a", "--alias", type="string", default="gr uhd usrp source0",
-                  help="The UHD block's alias to control (default=%default)")
-options, args = parser.parse_args()
-
-if(len(args) < 2):
-    sys.stderr.write('Not enough arguments: usrp_source_controller.py [options] <command> <value>\n')
-    sys.stderr.write('See the "UHD Interface" section of the manual for available commands.\n\n')
-    sys.exit(1)
+parser = ArgumentParser()
+parser.add_argument("-H", "--host", default="localhost",
+                  help="Hostname to connect to (default=%(default)r)")
+parser.add_argument("-p", "--port", type=int, default=9090,
+                  help="Port of Controlport instance on host (default=%(default)r)")
+parser.add_argument("-a", "--alias", default="gr uhd usrp source0",
+                  help="The UHD block's alias to control (default=%(default)r)")
+parser.add_argument("command", metavar="COMMAND")
+parser.add_argument("value", metavar="VALUE")
+args = parser.parse_args()
 
 port = 'command'
-alias = options.alias
-hostname = options.host
-portnum = options.port
-cmd = args[0]
-val = args[1]
+cmd = args.command
+val = args.value
 
 if(cmd == "tune" or cmd == "time"):
     sys.stderr.write("This application currently does not support the 'tune' or 'time' UHD "
@@ -35,8 +29,8 @@ if(cmd == "antenna"):
 else:
     val = pmt.from_double(float(val))
 
-argv = [None, hostname, portnum]
+argv = [None, args.host, args.port]
 radiosys = GNURadioControlPortClient(argv=argv, rpcmethod='thrift')
 radio = radiosys.client
 
-radio.postMessage(alias, port, pmt.cons(pmt.intern(cmd), val))
+radio.postMessage(args.alias, port, pmt.cons(pmt.intern(cmd), val))
diff --git a/gr-blocks/examples/metadata/CMakeLists.txt b/gr-blocks/examples/metadata/CMakeLists.txt
index 8d7bbe79e0..418b2d2594 100644
--- a/gr-blocks/examples/metadata/CMakeLists.txt
+++ b/gr-blocks/examples/metadata/CMakeLists.txt
@@ -26,5 +26,4 @@ install(
   file_metadata_vector_sink.grc
   file_metadata_vector_source.grc
   DESTINATION ${GR_PKG_DATA_DIR}/examples/metadata
-  COMPONENT "runtime_python"
 )
diff --git a/gr-blocks/examples/msg_passing/CMakeLists.txt b/gr-blocks/examples/msg_passing/CMakeLists.txt
index 9c24355f7f..9965ce878a 100644
--- a/gr-blocks/examples/msg_passing/CMakeLists.txt
+++ b/gr-blocks/examples/msg_passing/CMakeLists.txt
@@ -23,5 +23,4 @@ install(
   FILES
   strobe.grc
   DESTINATION ${GR_PKG_DATA_DIR}/examples/msg_passing
-  COMPONENT "runtime_python"
 )
diff --git a/gr-blocks/examples/tags/CMakeLists.txt b/gr-blocks/examples/tags/CMakeLists.txt
index 142b5cde6c..52cf4662bb 100644
--- a/gr-blocks/examples/tags/CMakeLists.txt
+++ b/gr-blocks/examples/tags/CMakeLists.txt
@@ -22,6 +22,4 @@ include(GrPython)
 GR_PYTHON_INSTALL(PROGRAMS
   test_file_tags.py
   DESTINATION ${GR_PKG_DATA_DIR}/examples/tags
-  COMPONENT "blocks_python"
 )
-