9 files changed, 128 insertions, 158 deletions
diff --git a/gr-fec/python/fec/polar/polar_channel_construction b/gr-fec/python/fec/polar/polar_channel_construction
index 448253659e..1c999aa145 100644
--- a/gr-fec/python/fec/polar/polar_channel_construction
+++ b/gr-fec/python/fec/polar/polar_channel_construction
@@ -21,25 +21,22 @@
 #
 """ A tool for POLAR code channel construction."""
 
-from optparse import OptionParser
+from argparse import ArgumentParser
 import gnuradio.fec.polar as cc
 
 
 def setup_parser():
-    """ Init the option parser. If derived classes need to add options,
+    """Init the argument parser. If derived classes need to add options,
     override this and call the parent function. """
-    parser = OptionParser(add_help_option=False)
-    parser.usage = '%prog [blocksize] [designsnr] [mu]'
-
-    parser.add_option("-h", "--help", action="help", help="Displays this help message.")
-
-    parser.add_option("-c", "--channel", action="store", type="string", dest="channel",
-                      help="specify channel, currently BEC or AWGN (default='BEC')", default='BEC')
-    parser.add_option("-b", "--blocksize", action="store", type="int", dest="block_size",
+    parser = ArgumentParser()
+    parser.add_argument("-c", "--channel", choices=('BEC', 'AWGN'),
+                      help="specify channel, currently BEC or AWGN (default='BEC')",
+                      default='BEC')
+    parser.add_argument("-b", "--blocksize", type=int, dest="block_size",
                       help="specify block size of polar code (default=16)", default=16)
-    parser.add_option("-s", "--desgin-snr", action="store", type="float", dest="design_snr",
+    parser.add_argument("-s", "--desgin-snr", type=float, dest="design_snr",
                       help="specify design SNR of polar code (default=0.0)", default=0.0)
-    parser.add_option("-k", "--mu", action="store", type="int", dest="mu",
+    parser.add_argument("-k", "--mu", type=int,
                       help="specify block size of polar code (default=2)", default=2)
 
     return parser
@@ -47,26 +44,13 @@ def setup_parser():
 
 def main():
     """ Here we go. Parse command, choose class and run. """
-    print('POLAR code channel constructor commandline tool')
+    print 'POLAR code channel constructor commandline tool'
     parser = setup_parser()
-    (options, args) = parser.parse_args()
-
-    channel = str(options.channel)
-    block_size = int(options.block_size)
-    design_snr = float(options.design_snr)
-    mu = int(options.mu)
-
-    if len(args) > 0:
-        channel = str(args[0])
-    if len(args) > 1:
-        block_size = int(args[1])
-    if len(args) > 2:
-        design_snr = float(args[2])
-    if len(args) == 4:
-        mu = int(args[3])
+    args = parser.parse_args()
 
-    z_params = cc.get_z_params(False, channel, block_size, design_snr, mu)
-    print(z_params)
+    z_params = cc.get_z_params(False, args.channel, args.block_size,
+            args.design_snr, args.mu)
+    print z_params
 
 
 if __name__ == '__main__':
diff --git a/gr-filter/examples/fft_filter_ccc.py b/gr-filter/examples/fft_filter_ccc.py
index 00b0697b6c..92bcc7e316 100755
--- a/gr-filter/examples/fft_filter_ccc.py
+++ b/gr-filter/examples/fft_filter_ccc.py
@@ -24,8 +24,8 @@ from gnuradio import gr, filter
 from gnuradio import analog
 from gnuradio import blocks
 from gnuradio import eng_notation
-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
 
 try:
@@ -68,30 +68,30 @@ class example_fft_filter_ccc(gr.top_block):
         self.connect(self.head, self.filt0, self.vsnk_out)
 
 def main():
-    parser = OptionParser(option_class=eng_option, conflict_handler="resolve")
-    parser.add_option("-N", "--nsamples", type="int", default=10000,
-                      help="Number of samples to process [default=%default]")
-    parser.add_option("-s", "--samplerate", type="eng_float", default=8000,
-                      help="System sample rate [default=%default]")
-    parser.add_option("-S", "--start-pass", type="eng_float", default=1000,
-                      help="Start of Passband [default=%default]")
-    parser.add_option("-E", "--end-pass", type="eng_float", default=2000,
-                      help="End of Passband [default=%default]")
-    parser.add_option("-T", "--transition", type="eng_float", default=100,
-                      help="Transition band [default=%default]")
-    parser.add_option("-A", "--attenuation", type="eng_float", default=80,
-                      help="Stopband attenuation [default=%default]")
-    parser.add_option("-D", "--decimation", type="int", default=1,
-                      help="Decmation factor [default=%default]")
-    (options, args) = parser.parse_args ()
-
-    put = example_fft_filter_ccc(options.nsamples,
-                                 options.samplerate,
-                                 options.start_pass,
-                                 options.end_pass,
-                                 options.transition,
-                                 options.attenuation,
-                                 options.decimation)
+    parser = ArgumentParser(conflict_handler="resolve")
+    parser.add_argument("-N", "--nsamples", type=int, default=10000,
+                      help="Number of samples to process [default=%(default)r]")
+    parser.add_argument("-s", "--samplerate", type=eng_float, default=8000,
+                      help="System sample rate [default=%(default)r]")
+    parser.add_argument("-S", "--start-pass", type=eng_float, default=1000,
+                      help="Start of Passband [default=%(default)r]")
+    parser.add_argument("-E", "--end-pass", type=eng_float, default=2000,
+                      help="End of Passband [default=%(default)r]")
+    parser.add_argument("-T", "--transition", type=eng_float, default=100,
+                      help="Transition band [default=%(default)r]")
+    parser.add_argument("-A", "--attenuation", type=eng_float, default=80,
+                      help="Stopband attenuation [default=%(default)r]")
+    parser.add_argument("-D", "--decimation", type=int, default=1,
+                      help="Decmation factor [default=%(default)r]")
+    args = parser.parse_args()
+
+    put = example_fft_filter_ccc(args.nsamples,
+                                 args.samplerate,
+                                 args.start_pass,
+                                 args.end_pass,
+                                 args.transition,
+                                 args.attenuation,
+                                 args.decimation)
     put.run()
 
     data_src = scipy.array(put.vsnk_src.data())
@@ -102,9 +102,9 @@ def main():
     f1 = pylab.figure(1, figsize=(12,10))
     s1 = f1.add_subplot(1,1,1)
     s1.psd(data_src, NFFT=nfft, noverlap=nfft/4,
-           Fs=options.samplerate)
+           Fs=args.samplerate)
     s1.psd(data_snk, NFFT=nfft, noverlap=nfft/4,
-           Fs=options.samplerate)
+           Fs=args.samplerate)
 
     f2 = pylab.figure(2, figsize=(12,10))
     s2 = f2.add_subplot(1,1,1)
diff --git a/gr-filter/examples/fir_filter_ccc.py b/gr-filter/examples/fir_filter_ccc.py
index b295e299bb..357e3d7111 100755
--- a/gr-filter/examples/fir_filter_ccc.py
+++ b/gr-filter/examples/fir_filter_ccc.py
@@ -24,8 +24,8 @@ from gnuradio import gr, filter
 from gnuradio import analog
 from gnuradio import blocks
 from gnuradio import eng_notation
-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
 
 try:
@@ -65,27 +65,27 @@ class example_fir_filter_ccc(gr.top_block):
         self.connect(self.head, self.filt0, self.vsnk_out)
 
 def main():
-    parser = OptionParser(option_class=eng_option, conflict_handler="resolve")
-    parser.add_option("-N", "--nsamples", type="int", default=10000,
-                      help="Number of samples to process [default=%default]")
-    parser.add_option("-s", "--samplerate", type="eng_float", default=8000,
-                      help="System sample rate [default=%default]")
-    parser.add_option("-B", "--bandwidth", type="eng_float", default=1000,
-                      help="Filter bandwidth [default=%default]")
-    parser.add_option("-T", "--transition", type="eng_float", default=100,
-                      help="Transition band [default=%default]")
-    parser.add_option("-A", "--attenuation", type="eng_float", default=80,
-                      help="Stopband attenuation [default=%default]")
-    parser.add_option("-D", "--decimation", type="int", default=1,
-                      help="Decmation factor [default=%default]")
-    (options, args) = parser.parse_args ()
-
-    put = example_fir_filter_ccc(options.nsamples,
-                                 options.samplerate,
-                                 options.bandwidth,
-                                 options.transition,
-                                 options.attenuation,
-                                 options.decimation)
+    parser = ArgumentParser(conflict_handler="resolve")
+    parser.add_argument("-N", "--nsamples", type=int, default=10000,
+                      help="Number of samples to process [default=%(default)r]")
+    parser.add_argument("-s", "--samplerate", type=eng_float, default=8000,
+                      help="System sample rate [default=%(default)r]")
+    parser.add_argument("-B", "--bandwidth", type=eng_float, default=1000,
+                      help="Filter bandwidth [default=%(default)r]")
+    parser.add_argument("-T", "--transition", type=eng_float, default=100,
+                      help="Transition band [default=%(default)r]")
+    parser.add_argument("-A", "--attenuation", type=eng_float, default=80,
+                      help="Stopband attenuation [default=%(default)r]")
+    parser.add_argument("-D", "--decimation", type=int, default=1,
+                      help="Decmation factor [default=%(default)r]")
+    args = parser.parse_args()
+
+    put = example_fir_filter_ccc(args.nsamples,
+                                 args.samplerate,
+                                 args.bandwidth,
+                                 args.transition,
+                                 args.attenuation,
+                                 args.decimation)
     put.run()
 
     data_src = scipy.array(put.vsnk_src.data())
@@ -96,9 +96,9 @@ def main():
     f1 = pylab.figure(1, figsize=(12,10))
     s1 = f1.add_subplot(1,1,1)
     s1.psd(data_src, NFFT=nfft, noverlap=nfft/4,
-           Fs=options.samplerate)
+           Fs=args.samplerate)
     s1.psd(data_snk, NFFT=nfft, noverlap=nfft/4,
-           Fs=options.samplerate)
+           Fs=args.samplerate)
 
     f2 = pylab.figure(2, figsize=(12,10))
     s2 = f2.add_subplot(1,1,1)
diff --git a/gr-filter/examples/fir_filter_fff.py b/gr-filter/examples/fir_filter_fff.py
index 60b61054e9..2019215f12 100755
--- a/gr-filter/examples/fir_filter_fff.py
+++ b/gr-filter/examples/fir_filter_fff.py
@@ -24,8 +24,8 @@ from gnuradio import gr, filter
 from gnuradio import analog
 from gnuradio import blocks
 from gnuradio import eng_notation
-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
 
 try:
@@ -65,27 +65,27 @@ class example_fir_filter_fff(gr.top_block):
         self.connect(self.head, self.filt0, self.vsnk_out)
 
 def main():
-    parser = OptionParser(option_class=eng_option, conflict_handler="resolve")
-    parser.add_option("-N", "--nsamples", type="int", default=10000,
-                      help="Number of samples to process [default=%default]")
-    parser.add_option("-s", "--samplerate", type="eng_float", default=8000,
-                      help="System sample rate [default=%default]")
-    parser.add_option("-B", "--bandwidth", type="eng_float", default=1000,
-                      help="Filter bandwidth [default=%default]")
-    parser.add_option("-T", "--transition", type="eng_float", default=100,
-                      help="Transition band [default=%default]")
-    parser.add_option("-A", "--attenuation", type="eng_float", default=80,
-                      help="Stopband attenuation [default=%default]")
-    parser.add_option("-D", "--decimation", type="int", default=1,
-                      help="Decmation factor [default=%default]")
-    (options, args) = parser.parse_args ()
-
-    put = example_fir_filter_fff(options.nsamples,
-                                 options.samplerate,
-                                 options.bandwidth,
-                                 options.transition,
-                                 options.attenuation,
-                                 options.decimation)
+    parser = ArgumentParser(conflict_handler="resolve")
+    parser.add_argument("-N", "--nsamples", type=int, default=10000,
+                      help="Number of samples to process [default=%(default)r]")
+    parser.add_argument("-s", "--samplerate", type=eng_float, default=8000,
+                      help="System sample rate [default=%(default)r]")
+    parser.add_argument("-B", "--bandwidth", type=eng_float, default=1000,
+                      help="Filter bandwidth [default=%(default)r]")
+    parser.add_argument("-T", "--transition", type=eng_float, default=100,
+                      help="Transition band [default=%(default)r]")
+    parser.add_argument("-A", "--attenuation", type=eng_float, default=80,
+                      help="Stopband attenuation [default=%(default)r]")
+    parser.add_argument("-D", "--decimation", type=int, default=1,
+                      help="Decmation factor [default=%(default)r]")
+    args = parser.parse_args()
+
+    put = example_fir_filter_fff(args.nsamples,
+                                 args.samplerate,
+                                 args.bandwidth,
+                                 args.transition,
+                                 args.attenuation,
+                                 args.decimation)
     put.run()
 
     data_src = scipy.array(put.vsnk_src.data())
@@ -96,9 +96,9 @@ def main():
     f1 = pylab.figure(1, figsize=(12,10))
     s1 = f1.add_subplot(1,1,1)
     s1.psd(data_src, NFFT=nfft, noverlap=nfft/4,
-           Fs=options.samplerate)
+           Fs=args.samplerate)
     s1.psd(data_snk, NFFT=nfft, noverlap=nfft/4,
-           Fs=options.samplerate)
+           Fs=args.samplerate)
 
     f2 = pylab.figure(2, figsize=(12,10))
     s2 = f2.add_subplot(1,1,1)
diff --git a/gr-qtgui/apps/plot_base.py b/gr-qtgui/apps/plot_base.py
index eaab7599c7..7a039e2135 100644
--- a/gr-qtgui/apps/plot_base.py
+++ b/gr-qtgui/apps/plot_base.py
@@ -21,8 +21,6 @@
 #
 
 from gnuradio import gr, blocks
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
 import os, sys
 
 os.environ['GR_CONF_CONTROLPORT_ON'] = 'False'
diff --git a/gr-utils/python/utils/gr_plot_char b/gr-utils/python/utils/gr_plot_char
index a2b93a63c6..ee644557bb 100755
--- a/gr-utils/python/utils/gr_plot_char
+++ b/gr-utils/python/utils/gr_plot_char
@@ -26,29 +26,26 @@ except ImportError:
     print "Please install SciPy to run this script (http://www.scipy.org/)"
     raise SystemExit, 1
 
-from optparse import OptionParser
+from argparse import ArgumentParser
 from gnuradio.plot_data import plot_data
 
 def main():
-    usage="%prog: [options] input_filenames"
     description = "Takes a GNU Radio byte/char binary file and displays the samples versus time. You can set the block size to specify how many points to read in at a time and the start position in the file. By default, the system assumes a sample rate of 1, so in time, each sample is plotted versus the sample number. To set a true time axis, set the sample rate (-R or --sample-rate) to the sample rate used when capturing the samples."
 
-    parser = OptionParser(conflict_handler="resolve", usage=usage, description=description)
-    parser.add_option("-B", "--block", type="int", default=1000,
-                      help="Specify the block size [default=%default]")
-    parser.add_option("-s", "--start", type="int", default=0,
-                      help="Specify where to start in the file [default=%default]")
-    parser.add_option("-R", "--sample-rate", type="float", default=1.0,
-                      help="Set the sampler rate of the data [default=%default]")
-
-    (options, args) = parser.parse_args ()
-    if len(args) < 1:
-        parser.print_help()
-        raise SystemExit, 1
-    filenames = args
-
-    datatype=scipy.int8
-    dc = plot_data(datatype, filenames, options)
+    parser = ArgumentParser(conflict_handler="resolve", description=description)
+    parser.add_argument("-B", "--block", type=int, default=1000,
+                      help="Specify the block size [default=%(default)r]")
+    parser.add_argument("-s", "--start", type=int, default=0,
+                      help="Specify where to start in the file [default=%(default)r]")
+    parser.add_argument("-R", "--sample-rate", type=float, default=1.0,
+                      help="Set the sampler rate of the data [default=%(default)r]")
+    parser.add_argument("files", metavar="FILE", nargs="+",
+                      help="Input file with complex samples")
+
+    args = parser.parse_args()
+
+    datatype = scipy.int8
+    dc = plot_data(datatype, args.files, args)
 
 if __name__ == "__main__":
     try:
diff --git a/gr-utils/python/utils/gr_plot_const b/gr-utils/python/utils/gr_plot_const
index e2580dd58f..28f6a540da 100755
--- a/gr-utils/python/utils/gr_plot_const
+++ b/gr-utils/python/utils/gr_plot_const
@@ -33,7 +33,7 @@ except ImportError:
     print "Please install Matplotlib to run this script (http://matplotlib.sourceforge.net/)"
     raise SystemExit, 1
 
-from optparse import OptionParser
+from argparse import ArgumentParser
 
 class draw_constellation:
     def __init__(self, filename, options):
@@ -221,24 +221,20 @@ def find(item_in, list_search):
 
 
 def main():
-    usage="%prog: [options] input_filename"
     description = "Takes a GNU Radio complex binary file and displays the I&Q data versus time and the constellation plot (I vs. Q). You can set the block size to specify how many points to read in at a time and the start position in the file. By default, the system assumes a sample rate of 1, so in time, each sample is plotted versus the sample number. To set a true time axis, set the sample rate (-R or --sample-rate) to the sample rate used when capturing the samples."
 
-    parser = OptionParser(conflict_handler="resolve", usage=usage, description=description)
-    parser.add_option("-B", "--block", type="int", default=1000,
-                      help="Specify the block size [default=%default]")
-    parser.add_option("-s", "--start", type="int", default=0,
-                      help="Specify where to start in the file [default=%default]")
-    parser.add_option("-R", "--sample-rate", type="float", default=1.0,
-                      help="Set the sampler rate of the data [default=%default]")
-
-    (options, args) = parser.parse_args ()
-    if len(args) != 1:
-        parser.print_help()
-        raise SystemExit, 1
-    filename = args[0]
-
-    dc = draw_constellation(filename, options)
+    parser = ArgumentParser(conflict_handler="resolve", description=description)
+    parser.add_argument("-B", "--block", type=int, default=1000,
+                      help="Specify the block size [default=%(default)r]")
+    parser.add_argument("-s", "--start", type=int, default=0,
+                      help="Specify where to start in the file [default=%(default)r]")
+    parser.add_argument("-R", "--sample-rate", type=float, default=1.0,
+                      help="Set the sampler rate of the data [default=%(default)r]")
+    parser.add_argument("file", metavar="FILE", nargs=1,
+                      help="Input file with complex samples")
+    args = parser.parse_args()
+
+    dc = draw_constellation(args.file[0], args)
 
 if __name__ == "__main__":
     try:
diff --git a/gr-utils/python/utils/gr_read_file_metadata b/gr-utils/python/utils/gr_read_file_metadata
index 429b38310f..2a907687d6 100644
--- a/gr-utils/python/utils/gr_read_file_metadata
+++ b/gr-utils/python/utils/gr_read_file_metadata
@@ -21,7 +21,7 @@
 #
 
 import sys
-from optparse import OptionParser
+from argparse import ArgumentParser
 
 import pmt
 from gnuradio.blocks import parse_file_metadata
@@ -69,19 +69,15 @@ def main(filename, detached=False):
         handle.seek(nread, 0)
         print "\n\n"
 
+
 if __name__ == "__main__":
-    usage="%prog: [options] filename"
     description = "Read in a GNU Radio file with meta data, extracts the header and prints it."
 
-    parser = OptionParser(conflict_handler="resolve",
-                          usage=usage, description=description)
-    parser.add_option("-D", "--detached", action="store_true", default=False,
+    parser = ArgumentParser(conflict_handler="resolve", description=description)
+    parser.add_argument("-D", "--detached", action="store_true",
                       help="Used if header is detached.")
-    (options, args) = parser.parse_args ()
-
-    if(len(args) < 1):
-        sys.stderr.write("No filename given\n")
-        sys.exit(1)
+    parser.add_argument("file", metavar="FILE", nargs=1,
+                      help="Input file");
+    args = parser.parse_args()
 
-    filename = args[0]
-    main(filename, options.detached)
+    main(args.file[0], args.detached)
diff --git a/gr-utils/python/utils/plot_data.py b/gr-utils/python/utils/plot_data.py
index 2ae3b1d5b3..7d80c714fe 100644
--- a/gr-utils/python/utils/plot_data.py
+++ b/gr-utils/python/utils/plot_data.py
@@ -34,7 +34,6 @@ except ImportError:
     print "Please install Matplotlib to run this script (http://matplotlib.sourceforge.net/)"
     raise SystemExit, 1
 
-from optparse import OptionParser
 
 class plot_data:
     def __init__(self, datatype, filenames, options):