changeset 78:1e1d478f4845

Cleanups.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 28 Feb 2022 14:46:29 +0200
parents fea973d0bc76
children 5c7913c838cb
files lxmldump.py
diffstat 1 files changed, 12 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/lxmldump.py	Sat Jan 22 23:48:29 2022 +0200
+++ b/lxmldump.py	Mon Feb 28 14:46:29 2022 +0200
@@ -211,6 +211,11 @@
 
 
 def pkk_arg_range(vstr, vmin, vmax):
+    try:
+        value = int(vstr)
+    except Exception as e:
+        raise argparse.ArgumentTypeError(f"value '{vstr}' is not an integer")
+
     value = int(vstr)
     if value < vmin or value > vmax:
         raise argparse.ArgumentTypeError(f"value {value} not in range {vmin}-{vmax}")
@@ -497,7 +502,13 @@
         sys.exit(2)
 
 
-def pkk_get_argparser():
+###
+### Main program starts
+###
+if __name__ == "__main__":
+    signal.signal(signal.SIGINT, pkk_signal_handler)
+
+    ### Parse arguments
     optparser = PKKArgumentParser(
         usage="%(prog)s [options] <input xml file(s)>"
         )
@@ -544,17 +555,6 @@
         action="store_true",
         help=argparse.SUPPRESS)
 
-    return optparser
-
-
-###
-### Main program starts
-###
-if __name__ == "__main__":
-    signal.signal(signal.SIGINT, pkk_signal_handler)
-
-    ### Parse arguments
-    optparser = pkk_get_argparser()
     pkk_cfg = optparser.parse_args()
 
     if pkk_cfg.list_values: