14 files changed, 135 insertions, 185 deletions
diff --git a/gnuradio-runtime/examples/mp-sched/CMakeLists.txt b/gnuradio-runtime/examples/mp-sched/CMakeLists.txt
index 863cfa733a..4e07366d4f 100644
--- a/gnuradio-runtime/examples/mp-sched/CMakeLists.txt
+++ b/gnuradio-runtime/examples/mp-sched/CMakeLists.txt
@@ -26,11 +26,9 @@ GR_PYTHON_INSTALL(PROGRAMS
   synthetic.py
   wfm_rcv_pll_to_wav.py
   DESTINATION ${GR_PKG_DATA_DIR}/examples/mp-sched
-  COMPONENT "runtime_python"
 )
 
 install(
     FILES README
     DESTINATION ${GR_PKG_DATA_DIR}/examples/mp-sched
-    COMPONENT "runtime_python"
 )
diff --git a/gnuradio-runtime/examples/mp-sched/affinity_set.py b/gnuradio-runtime/examples/mp-sched/affinity_set.py
index 15d2233b6a..e6637b44bf 100755
--- a/gnuradio-runtime/examples/mp-sched/affinity_set.py
+++ b/gnuradio-runtime/examples/mp-sched/affinity_set.py
@@ -8,9 +8,9 @@ from gnuradio import eng_notation
 from gnuradio import gr
 from gnuradio import blocks
 from gnuradio import filter
-from gnuradio.eng_option import eng_option
+from gnuradio.eng_arg import eng_arg
 from gnuradio.filter import firdes
-from optparse import OptionParser
+from argparse import ArgumentParser
 import sys
 
 class affinity_set(gr.top_block):
@@ -51,8 +51,8 @@ class affinity_set(gr.top_block):
         self.samp_rate = samp_rate
 
 if __name__ == '__main__':
-    parser = OptionParser(option_class=eng_option, usage="%prog: [options]")
-    (options, args) = parser.parse_args()
+    parser = ArgumentParser()
+    args = parser.parse_args()
     tb = affinity_set()
     tb.start()
 
diff --git a/gnuradio-runtime/examples/mp-sched/plot_flops.py b/gnuradio-runtime/examples/mp-sched/plot_flops.py
index d9d810ae2f..9bd2ff12bb 100755
--- a/gnuradio-runtime/examples/mp-sched/plot_flops.py
+++ b/gnuradio-runtime/examples/mp-sched/plot_flops.py
@@ -28,7 +28,7 @@ import re
 import sys
 import os
 import tempfile
-from optparse import OptionParser
+from argparse import ArgumentParser
 
 
 def parse_file(input_filename, output):
@@ -84,14 +84,11 @@ def handle_file(input_filename):
 
 
 def main():
-    usage = "usage: %prog [options] file.dat"
-    parser = OptionParser(usage=usage)
-    (options, args) = parser.parse_args()
-    if len(args) != 1:
-        parser.print_help()
-        raise SystemExit, 1
-
-    handle_file(args[0])
+    parser = ArgumentParser()
+    parser.add_argument('file', help='Input file')
+    args = parser.parse_args()
+
+    handle_file(args.file)
 
 
 if __name__ == '__main__':
diff --git a/gnuradio-runtime/examples/mp-sched/run_synthetic.py b/gnuradio-runtime/examples/mp-sched/run_synthetic.py
index 4896bca462..802fb9fd34 100755
--- a/gnuradio-runtime/examples/mp-sched/run_synthetic.py
+++ b/gnuradio-runtime/examples/mp-sched/run_synthetic.py
@@ -27,7 +27,7 @@ import re
 import sys
 import os
 import tempfile
-from optparse import OptionParser
+from argparse import ArgumentParser
 
 
 def write_shell_script(f, data_filename, description, ncores, gflops, max_pipes_and_stages):
@@ -70,31 +70,26 @@ total runtime of about 43 minutes, assuming that your values for -n and -f are r
 For x86 machines, assume 3 FLOPS per processor Hz. E.g., 3 GHz machine -> 9 GFLOPS.
 plot_flops.py will make pretty graphs from the output data generated by %prog.
 """
-    usage = "usage: %prog [options] output.dat"
-    parser = OptionParser(usage=usage, description=description)
-    parser.add_option("-d", "--description", metavar="DESC",
-                      help="machine description, e.g., \"Dual quad-core Xeon 3 GHz\"", default=None)
-    parser.add_option("-n", "--ncores", type="int", default=1,
-                      help="number of processor cores [default=%default]")
-    parser.add_option("-g", "--gflops", metavar="GFLOPS", type="float", default=3.0,
-                      help="estimated GFLOPS per core [default=%default]")
-    parser.add_option("-m", "--max-pipes-and-stages", metavar="MAX", type="int", default=16,
-                      help="maximum number of pipes and stages to use [default=%default]")
-    (options, args) = parser.parse_args()
-    if len(args) != 1:
-        parser.print_help()
-        raise SystemExit, 1
-
-    output_filename = args[0]
+    parser = ArgumentParser(description=description)
+    parser.add_argument("-d", "--description", metavar="DESC",
+            help="machine description, e.g., \"Dual quad-core Xeon 3 GHz\"")
+    parser.add_argument("-n", "--ncores", type=int, default=1,
+            help="number of processor cores [default=%(default)s]")
+    parser.add_argument("-g", "--gflops", metavar="GFLOPS", type=float, default=3.0,
+            help="estimated GFLOPS per core [default=%(default)s]")
+    parser.add_argument("-m", "--max-pipes-and-stages", metavar="MAX", type=int, default=16,
+            help="maximum number of pipes and stages to use [default=%(default)s]")
+    parser.add_argument("output_file_name", metavar="FILE", help="output file name")
+    args = parser.parse_args()
 
     shell = os.popen("/bin/sh", "w")
 
     write_shell_script(shell,
-                       output_filename,
-                       options.description,
-                       options.ncores,
-                       options.gflops,
-                       options.max_pipes_and_stages)
+                       args.output_file_name,
+                       args.description,
+                       args.ncores,
+                       args.gflops,
+                       args.max_pipes_and_stages)
 
 if __name__ == '__main__':
     main()
diff --git a/gnuradio-runtime/examples/mp-sched/synthetic.py b/gnuradio-runtime/examples/mp-sched/synthetic.py
index d815879cff..16e39734ae 100755
--- a/gnuradio-runtime/examples/mp-sched/synthetic.py
+++ b/gnuradio-runtime/examples/mp-sched/synthetic.py
@@ -21,8 +21,8 @@
 
 from gnuradio import gr, eng_notation
 from gnuradio import blocks, filter
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
+from gnuradio.eng_arg import eng_float, intx
+from argparse import ArgumentParser
 import os
 
 
@@ -50,38 +50,35 @@ class top(gr.top_block):
         gr.top_block.__init__(self)
 
         default_nsamples = 10e6
-        parser=OptionParser(option_class=eng_option)
-        parser.add_option("-p", "--npipelines", type="intx", default=1,
-                          metavar="NPIPES", help="the number of pipelines to create (default=%default)")
-        parser.add_option("-s", "--nstages", type="intx", default=1,
-                          metavar="NSTAGES", help="the number of stages in each pipeline (default=%default)")
-        parser.add_option("-N", "--nsamples", type="eng_float", default=default_nsamples,
+        parser = ArgumentParser()
+        parser.add_argument("-p", "--npipelines", type=intx, default=1,
+                          metavar="NPIPES", help="the number of pipelines to create (default=%(default)s)")
+        parser.add_argument("-s", "--nstages", type=intx, default=1, metavar="NSTAGES",
+                          help="the number of stages in each pipeline (default=%(default)s)")
+        parser.add_argument("-N", "--nsamples", type=eng_float, default=default_nsamples,
                           help=("the number of samples to run through the graph (default=%s)" %
                                 (eng_notation.num_to_str(default_nsamples))))
-        parser.add_option("-m", "--machine-readable", action="store_true", default=False,
+        parser.add_argument("-m", "--machine-readable", action="store_true", default=False,
                           help="enable machine readable output")
 
-        (options, args) = parser.parse_args()
-        if len(args) != 0:
-            parser.print_help()
-            raise SystemExit, 1
+        args = parser.parse_args()
 
-        self.npipes = options.npipelines
-        self.nstages = options.nstages
-        self.nsamples = options.nsamples
-        self.machine_readable = options.machine_readable
+        self.npipes = args.npipelines
+        self.nstages = args.nstages
+        self.nsamples = args.nsamples
+        self.machine_readable = args.machine_readable
 
         ntaps = 256
 
         # Something vaguely like floating point ops
-        self.flop = 2 * ntaps * options.npipelines * options.nstages * options.nsamples
+        self.flop = 2 * ntaps * args.npipelines * args.nstages * args.nsamples
 
         src = blocks.null_source(gr.sizeof_float)
-        head = blocks.head(gr.sizeof_float, int(options.nsamples))
+        head = blocks.head(gr.sizeof_float, int(args.nsamples))
         self.connect(src, head)
 
-        for n in range(options.npipelines):
-            self.connect(head, pipeline(options.nstages, ntaps))
+        for n in range(args.npipelines):
+            self.connect(head, pipeline(args.nstages, ntaps))
 
 
 def time_it(tb):
diff --git a/gnuradio-runtime/examples/mp-sched/wfm_rcv_pll_to_wav.py b/gnuradio-runtime/examples/mp-sched/wfm_rcv_pll_to_wav.py
index 1a43dc3a11..bb3296d428 100755
--- a/gnuradio-runtime/examples/mp-sched/wfm_rcv_pll_to_wav.py
+++ b/gnuradio-runtime/examples/mp-sched/wfm_rcv_pll_to_wav.py
@@ -24,8 +24,8 @@ from gnuradio import gr, gru, eng_notation, filter
 from gnuradio import audio
 from gnuradio import analog
 from gnuradio import blocks
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
+from gnuradio.eng_arg import eng_float, intx
+from argparse import ArgumentParser
 import sys
 import math
 
@@ -33,24 +33,20 @@ class wfm_rx_block (gr.top_block):
     def __init__(self):
         gr.top_block.__init__(self)
 
-        usage = "usage: %prog [options] input-samples-320kS.dat output.wav"
-        parser=OptionParser(option_class=eng_option, usage=usage)
-        parser.add_option("-V", "--volume", type="eng_float", default=None,
-                          help="set volume (default is midpoint)")
+        parser = ArgumentParser(description="Decode WFM signal into WAV file.")
+        parser.add_argument("-V", "--volume", type=eng_float,
+                help="Volume (dB) <%r, %r> (default is midpoint)" % \
+                        self.volume_range()[:2])
+        parser.add_argument("input_file", help="Input file (complex samples)")
+        parser.add_argument("output_file", help="Output WAV file")
 
-        (options, args) = parser.parse_args()
-        if len(args) != 2:
-            parser.print_help()
-            sys.exit(1)
-
-        input_filename = args[0]
-        output_filename = args[1]
+        args = parser.parse_args()
 
         self.vol = 0
 
         # build graph
 
-        self.src = blocks.file_source(gr.sizeof_gr_complex, input_filename, False)
+        self.src = blocks.file_source(gr.sizeof_gr_complex, args.input_file, False)
 
         adc_rate = 64e6                             # 64 MS/s
         usrp_decim = 200
@@ -80,10 +76,10 @@ class wfm_rx_block (gr.top_block):
 
         # wave file as final sink
         if 1:
-            sink = blocks.wavfile_sink(output_filename, 2, int(audio_rate), 16)
+            sink = blocks.wavfile_sink(args.output_file, 2, int(audio_rate), 16)
         else:
             sink = audio.sink (int (audio_rate),
-                               options.audio_output,
+                               args.audio_output,
                                False)   # ok_to_block
 
         # now wire it all together
@@ -96,15 +92,15 @@ class wfm_rx_block (gr.top_block):
           pass
           #print "FYI: This implementation of the stereo_carrier_pll_recovery has no squelch implementation yet"
 
-        if options.volume is None:
+        if args.volume is None:
             g = self.volume_range()
-            options.volume = float(g[0]+g[1])/2
+            args.volume = float(g[0]+g[1])/2
 
         # set initial values
 
-        self.set_vol(options.volume)
+        self.set_vol(args.volume)
         try:
-          self.guts.stereo_carrier_pll_recovery.set_lock_threshold(options.squelch)
+          self.guts.stereo_carrier_pll_recovery.set_lock_threshold(args.squelch)
         except:
           pass
           #print "FYI: This implementation of the stereo_carrier_pll_recovery has no squelch implementation yet"
diff --git a/gnuradio-runtime/examples/network/CMakeLists.txt b/gnuradio-runtime/examples/network/CMakeLists.txt
index 92eb734768..08f498b469 100644
--- a/gnuradio-runtime/examples/network/CMakeLists.txt
+++ b/gnuradio-runtime/examples/network/CMakeLists.txt
@@ -25,6 +25,4 @@ GR_PYTHON_INSTALL(PROGRAMS
   vector_sink.py
   vector_source.py
   DESTINATION ${GR_PKG_DATA_DIR}/examples/network
-  COMPONENT "runtime_python"
 )
-
diff --git a/gnuradio-runtime/examples/network/audio_sink.py b/gnuradio-runtime/examples/network/audio_sink.py
index de20abe48d..9b91db5d1e 100755
--- a/gnuradio-runtime/examples/network/audio_sink.py
+++ b/gnuradio-runtime/examples/network/audio_sink.py
@@ -22,8 +22,7 @@
 
 from gnuradio import gr
 from gnuradio import blocks
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
+from argparse import ArgumentParser
 import sys
 
 try:
@@ -40,26 +39,22 @@ class audio_sink(gr.top_block):
         self.connect(src, dst)
 
 if __name__ == '__main__':
-    parser = OptionParser(option_class=eng_option)
-    parser.add_option("", "--host", type="string", default="0.0.0.0",
+    parser = ArgumentParser()
+    parser.add_argument("--host", default="0.0.0.0",
                       help="local host name (domain name or IP address)")
-    parser.add_option("", "--port", type="int", default=65500,
+    parser.add_argument("--port", type=int, default=65500,
                       help="port value to listen to for connection")
-    parser.add_option("", "--packet-size", type="int", default=1472,
+    parser.add_argument("--packet-size", type=int, default=1472,
                       help="packet size.")
-    parser.add_option("-r", "--sample-rate", type="int", default=32000,
-                      help="audio signal sample rate [default=%default]")
-    parser.add_option("", "--no-eof", action="store_true", default=False,
+    parser.add_argument("-r", "--sample-rate", type=int, default=32000,
+                      help="audio signal sample rate [default=%(default)r]")
+    parser.add_argument("--no-eof", action="store_true", default=False,
                       help="don't send EOF on disconnect")
-    (options, args) = parser.parse_args()
-    if len(args) != 0:
-        parser.print_help()
-        raise SystemExit, 1
-
+    args = parser.parse_args()
     # Create an instance of a hierarchical block
-    top_block = audio_sink(options.host, options.port,
-                           options.packet_size, options.sample_rate,
-                           not options.no_eof)
+    top_block = audio_sink(args.host, args.port,
+                           args.packet_size, args.sample_rate,
+                           not args.no_eof)
 
     try:
         # Run forever
diff --git a/gnuradio-runtime/examples/network/audio_source.py b/gnuradio-runtime/examples/network/audio_source.py
index 881efff81a..6a464a8f28 100755
--- a/gnuradio-runtime/examples/network/audio_source.py
+++ b/gnuradio-runtime/examples/network/audio_source.py
@@ -22,8 +22,7 @@
 
 from gnuradio import gr
 from gnuradio import blocks
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
+from argparse import ArgumentParser
 import sys
 
 try:
@@ -36,30 +35,26 @@ class audio_source(gr.top_block):
     def __init__(self, host, port, pkt_size, sample_rate, eof):
         gr.top_block.__init__(self, "audio_source")
         self.audio = audio.source(sample_rate)
-	self.sink = blocks.udp_sink(gr.sizeof_float, host, port, pkt_size, eof=eof)
+        self.sink = blocks.udp_sink(gr.sizeof_float, host, port, pkt_size, eof=eof)
         self.connect(self.audio, self.sink)
 
 if __name__ == '__main__':
-    parser = OptionParser(option_class=eng_option)
-    parser.add_option("", "--host", type="string", default="127.0.0.1",
+    parser = ArgumentParser()
+    parser.add_argument("--host", default="127.0.0.1",
                       help="Remote host name (domain name or IP address")
-    parser.add_option("", "--port", type="int", default=65500,
+    parser.add_argument("--port", type=int, default=65500,
                       help="port number to connect to")
-    parser.add_option("", "--packet-size", type="int", default=1472,
+    parser.add_argument("--packet-size", type=int, default=1472,
                       help="packet size.")
-    parser.add_option("-r", "--sample-rate", type="int", default=32000 ,
-                      help="audio signal sample rate [default=%default]")
-    parser.add_option("", "--no-eof", action="store_true", default=False,
+    parser.add_argument("-r", "--sample-rate", type=int, default=32000 ,
+                      help="audio signal sample rate [default=%(default)r]")
+    parser.add_argument("--no-eof", action="store_true", default=False,
                       help="don't send EOF on disconnect")
-    (options, args) = parser.parse_args()
-    if len(args) != 0:
-        parser.print_help()
-        raise SystemExit, 1
-
+    args = parser.parse_args()
     # Create an instance of a hierarchical block
-    top_block = audio_source(options.host, options.port,
-                             options.packet_size, options.sample_rate,
-                             not options.no_eof)
+    top_block = audio_source(args.host, args.port,
+                             args.packet_size, args.sample_rate,
+                             not args.no_eof)
 
     try:
         # Run forever
diff --git a/gnuradio-runtime/examples/network/dial_tone_sink.py b/gnuradio-runtime/examples/network/dial_tone_sink.py
index 7139a13250..4b1db98649 100755
--- a/gnuradio-runtime/examples/network/dial_tone_sink.py
+++ b/gnuradio-runtime/examples/network/dial_tone_sink.py
@@ -22,8 +22,7 @@
 
 from gnuradio import gr, audio
 from gnuradio import blocks
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
+from argparse import ArgumentParser
 
 class dial_tone_sink(gr.top_block):
     def __init__(self, host, port, pkt_size, sample_rate, eof):
@@ -33,26 +32,22 @@ class dial_tone_sink(gr.top_block):
         self.connect(udp, sink)
 
 if __name__ == '__main__':
-    parser = OptionParser(option_class=eng_option)
-    parser.add_option("", "--host", type="string", default="0.0.0.0",
+    parser = ArgumentParser()
+    parser.add_argument("--host", default="0.0.0.0",
                       help="local host name (domain name or IP address)")
-    parser.add_option("", "--port", type="int", default=65500,
+    parser.add_argument("--port", type=int, default=65500,
                       help="port value to listen to for connection")
-    parser.add_option("", "--packet-size", type="int", default=1472,
+    parser.add_argument("--packet-size", type=int, default=1472,
                       help="packet size.")
-    parser.add_option("-r", "--sample-rate", type="int", default=8000,
-                      help="audio signal sample rate [default=%default]")
-    parser.add_option("", "--no-eof", action="store_true", default=False,
+    parser.add_argument("-r", "--sample-rate", type=int, default=8000,
+                      help="audio signal sample rate [default=%(default)r]")
+    parser.add_argument("--no-eof", action="store_true", default=False,
                       help="don't send EOF on disconnect")
-    (options, args) = parser.parse_args()
-    if len(args) != 0:
-        parser.print_help()
-        raise SystemExit, 1
-
+    args = parser.parse_args()
     # Create an instance of a hierarchical block
-    top_block = dial_tone_sink(options.host, options.port,
-                               options.packet_size, options.sample_rate,
-                               not options.no_eof)
+    top_block = dial_tone_sink(args.host, args.port,
+                               args.packet_size, args.sample_rate,
+                               not args.no_eof)
 
     try:
         # Run forever
diff --git a/gnuradio-runtime/examples/network/dial_tone_source.py b/gnuradio-runtime/examples/network/dial_tone_source.py
index 20c9a3b800..ee2bc9529b 100755
--- a/gnuradio-runtime/examples/network/dial_tone_source.py
+++ b/gnuradio-runtime/examples/network/dial_tone_source.py
@@ -21,8 +21,7 @@
 #
 
 from gnuradio import gr
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
+from argparse import ArgumentParser
 import sys
 
 try:
@@ -45,33 +44,29 @@ class dial_tone_source(gr.top_block):
         add = blocks.add_ff()
 
         # Throttle needed here to account for the other side's audio card sampling rate
-	thr = blocks.throttle(gr.sizeof_float, sample_rate)
-	sink = blocks.udp_sink(gr.sizeof_float, host, port, pkt_size, eof=eof)
-	self.connect(src0, (add, 0))
-	self.connect(src1, (add, 1))
-	self.connect(add, thr, sink)
+        thr = blocks.throttle(gr.sizeof_float, sample_rate)
+        sink = blocks.udp_sink(gr.sizeof_float, host, port, pkt_size, eof=eof)
+        self.connect(src0, (add, 0))
+        self.connect(src1, (add, 1))
+        self.connect(add, thr, sink)
 
 if __name__ == '__main__':
-    parser = OptionParser(option_class=eng_option)
-    parser.add_option("", "--host", type="string", default="127.0.0.1",
+    parser = ArgumentParser()
+    parser.add_argument("--host", default="127.0.0.1",
                       help="Remote host name (domain name or IP address")
-    parser.add_option("", "--port", type="int", default=65500,
+    parser.add_argument("--port", type=int, default=65500,
                       help="port number to connect to")
-    parser.add_option("", "--packet-size", type="int", default=1472,
+    parser.add_argument("--packet-size", type=int, default=1472,
                       help="packet size.")
-    parser.add_option("-r", "--sample-rate", type="int", default=8000,
-                      help="audio signal sample rate [default=%default]")
-    parser.add_option("", "--no-eof", action="store_true", default=False,
+    parser.add_argument("-r", "--sample-rate", type=int, default=8000,
+                      help="audio signal sample rate [default=%(default)r]")
+    parser.add_argument("--no-eof", action="store_true", default=False,
                       help="don't send EOF on disconnect")
-    (options, args) = parser.parse_args()
-    if len(args) != 0:
-        parser.print_help()
-        raise SystemExit, 1
-
+    args = parser.parse_args()
     # Create an instance of a hierarchical block
-    top_block = dial_tone_source(options.host, options.port,
-                                 options.packet_size, options.sample_rate,
-                                 not options.no_eof)
+    top_block = dial_tone_source(args.host, args.port,
+                                 args.packet_size, args.sample_rate,
+                                 not args.no_eof)
 
     try:
         # Run forever
diff --git a/gnuradio-runtime/examples/network/vector_sink.py b/gnuradio-runtime/examples/network/vector_sink.py
index c756f36f42..362f631380 100755
--- a/gnuradio-runtime/examples/network/vector_sink.py
+++ b/gnuradio-runtime/examples/network/vector_sink.py
@@ -22,8 +22,8 @@
 
 from gnuradio import gr
 from gnuradio import blocks
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
+from gnuradio.eng_arg import eng_float, intx
+from argparse import ArgumentParser
 
 class vector_sink(gr.top_block):
     def __init__(self, host, port, pkt_size, eof):
@@ -34,24 +34,20 @@ class vector_sink(gr.top_block):
         self.connect(udp, sink)
 
 if __name__ == "__main__":
-    parser = OptionParser(option_class=eng_option)
-    parser.add_option("", "--host", type="string", default="0.0.0.0",
+    parser = ArgumentParser()
+    parser.add_argument("-H", "--host", default="0.0.0.0",
                       help="local host name (domain name or IP address)")
-    parser.add_option("", "--port", type="int", default=65500,
+    parser.add_argument("-p", "--port", type=int, default=65500,
                       help="port value to listen to for connection")
-    parser.add_option("", "--packet-size", type="int", default=1471,
+    parser.add_argument("-s", "--packet-size", type=int, default=1471,
                       help="packet size.")
-    parser.add_option("", "--no-eof", action="store_true", default=False,
+    parser.add_argument("--no-eof", action="store_true", default=False,
                       help="don't send EOF on disconnect")
-    (options, args) = parser.parse_args()
-    if len(args) != 0:
-        parser.print_help()
-        raise SystemExit, 1
-
+    args = parser.parse_args()
     # Create an instance of a hierarchical block
-    top_block = vector_sink(options.host, options.port,
-                            options.packet_size,
-                            not options.no_eof)
+    top_block = vector_sink(args.host, args.port,
+                            args.packet_size,
+                            not args.no_eof)
 
     try:
         # Run forever
diff --git a/gnuradio-runtime/examples/network/vector_source.py b/gnuradio-runtime/examples/network/vector_source.py
index c13b4b1d6f..be40134bc0 100755
--- a/gnuradio-runtime/examples/network/vector_source.py
+++ b/gnuradio-runtime/examples/network/vector_source.py
@@ -22,8 +22,7 @@
 
 from gnuradio import gr
 from gnuradio import blocks
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
+from argparse import ArgumentParser
 
 class vector_source(gr.top_block):
     def __init__(self, host, port, pkt_size, eof):
@@ -34,23 +33,19 @@ class vector_source(gr.top_block):
         self.connect(vec, udp)
 
 if __name__ == '__main__':
-    parser = OptionParser(option_class=eng_option)
-    parser.add_option("", "--host", type="string", default="127.0.0.1",
+    parser = ArgumentParser()
+    parser.add_argument("--host", default="127.0.0.1",
                       help="Remote host name (domain name or IP address")
-    parser.add_option("", "--port", type="int", default=65500,
+    parser.add_argument("--port", type=int, default=65500,
                       help="port number to connect to")
-    parser.add_option("", "--packet-size", type="int", default=1471,
+    parser.add_argument("--packet-size", type=int, default=1471,
                       help="packet size.")
-    parser.add_option("", "--no-eof", action="store_true", default=False,
+    parser.add_argument("--no-eof", action="store_true", default=False,
                       help="don't send EOF on disconnect")
-    (options, args) = parser.parse_args()
-    if len(args) != 0:
-        parser.print_help()
-        raise SystemExit, 1
-
+    args = parser.parse_args()
 # Create an instance of a hierarchical block
-    top_block = vector_source(options.host, options.port, options.packet_size,
-                              not options.no_eof)
+    top_block = vector_source(args.host, args.port, args.packet_size,
+                              not args.no_eof)
 
     try:
         # Run forever
diff --git a/gnuradio-runtime/examples/volk_benchmark/CMakeLists.txt b/gnuradio-runtime/examples/volk_benchmark/CMakeLists.txt
index f56675e556..076ef359e8 100644
--- a/gnuradio-runtime/examples/volk_benchmark/CMakeLists.txt
+++ b/gnuradio-runtime/examples/volk_benchmark/CMakeLists.txt
@@ -25,11 +25,9 @@ GR_PYTHON_INSTALL(PROGRAMS
   volk_test_funcs.py
   volk_types.py
   DESTINATION ${GR_PKG_DATA_DIR}/examples/volk_benchmark
-  COMPONENT "runtime_python"
 )
 
 install(
     FILES README
     DESTINATION ${GR_PKG_DATA_DIR}/examples/volk_benchmark
-    COMPONENT "runtime_python"
 )