3 files changed, 27 insertions, 35 deletions
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..c80820b8a3 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', nargs=1)
+    args = parser.parse_args()
+
+    handle_file(args.file[0])
 
 
 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()