examples: replace OptionParser by ArgumentParser

author: Jiří Pinkava <j-pi@seznam.cz> 2016-05-29 12:57:37 +0200
committer: Jiří Pinkava <j-pi@seznam.cz> 2016-09-17 16:48:34 +0200
commit: ce2b0900fb619c27c51b1495197e5a95bde5e3c6 (patch)
tree: c05b1e6097a459aec0475e394927b7b5bb35341c /gnuradio-runtime/examples/network
parent: 54ede29960f9022a8040e10c0d58fa8fed989a3f (diff)
6 files changed, 74 insertions, 103 deletions
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
author	Jiří Pinkava <j-pi@seznam.cz>	2016-05-29 12:57:37 +0200
committer	Jiří Pinkava <j-pi@seznam.cz>	2016-09-17 16:48:34 +0200
commit	ce2b0900fb619c27c51b1495197e5a95bde5e3c6 (patch)
tree	c05b1e6097a459aec0475e394927b7b5bb35341c /gnuradio-runtime/examples/network
parent	54ede29960f9022a8040e10c0d58fa8fed989a3f (diff)