Use customized ArgumentParser everywhere

kernelci · Aug 4, 2020 · 82762c6 · 82762c6
1 parent 3ab6439
commit 82762c6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/kcidb/mq/__init__.py b/kcidb/mq/__init__.py
@@ -1,11 +1,10 @@
 """Kernel CI report message queue"""
 
-import argparse
 import json
 import sys
 from google.cloud import pubsub
 from google.api_core.exceptions import DeadlineExceeded
-from kcidb import io
+from kcidb import io, misc
 
 
 class Publisher:
@@ -153,7 +152,7 @@ def publisher_init_main():
     """Execute the kcidb-mq-publisher-init command-line tool"""
     description = \
         'kcidb-mq-publisher-init - Initialize a Kernel CI report publisher'
-    parser = argparse.ArgumentParser(description=description)
+    parser = misc.ArgumentParser(description=description)
     parser.add_argument(
         '-p', '--project',
         help='ID of the Google Cloud project with the message queue',
@@ -173,7 +172,7 @@ def publisher_cleanup_main():
     """Execute the kcidb-mq-publisher-cleanup command-line tool"""
     description = \
         'kcidb-mq-publisher-cleanup - Cleanup a Kernel CI report publisher'
-    parser = argparse.ArgumentParser(description=description)
+    parser = misc.ArgumentParser(description=description)
     parser.add_argument(
         '-p', '--project',
         help='ID of the Google Cloud project with the message queue',
@@ -194,7 +193,7 @@ def publisher_publish_main():
     description = \
         'kcidb-mq-publisher-publish - ' \
         'Publish with a Kernel CI report publisher'
-    parser = argparse.ArgumentParser(description=description)
+    parser = misc.ArgumentParser(description=description)
     parser.add_argument(
         '-p', '--project',
         help='ID of the Google Cloud project with the message queue',
@@ -216,7 +215,7 @@ def subscriber_init_main():
     """Execute the kcidb-mq-subscriber-init command-line tool"""
     description = \
         'kcidb-mq-subscriber-init - Initialize a Kernel CI report subscriber'
-    parser = argparse.ArgumentParser(description=description)
+    parser = misc.ArgumentParser(description=description)
     parser.add_argument(
         '-p', '--project',
         help='ID of the Google Cloud project with the message queue',
@@ -241,7 +240,7 @@ def subscriber_cleanup_main():
     """Execute the kcidb-mq-subscriber-cleanup command-line tool"""
     description = \
         'kcidb-mq-subscriber-cleanup - Cleanup a Kernel CI report subscriber'
-    parser = argparse.ArgumentParser(description=description)
+    parser = misc.ArgumentParser(description=description)
     parser.add_argument(
         '-p', '--project',
         help='ID of the Google Cloud project with the message queue',
@@ -266,7 +265,7 @@ def subscriber_pull_main():
     """Execute the kcidb-mq-subscriber-pull command-line tool"""
     description = \
         'kcidb-mq-subscriber-pull - Pull with a Kernel CI report subscriber'
-    parser = argparse.ArgumentParser(description=description)
+    parser = misc.ArgumentParser(description=description)
     parser.add_argument(
         '-p', '--project',
         help='ID of the Google Cloud project with the message queue',

diff --git a/kcidb/spool/__init__.py b/kcidb/spool/__init__.py
@@ -7,7 +7,6 @@
 every notification email is sent, and sent only once (as well as possible).
 """
 
-import argparse
 import datetime
 import email
 import email.policy
@@ -254,7 +253,7 @@ def wipe_main():
     """Execute the kcidb-spool-wipe command-line tool"""
     description = \
         'kcidb-spool-wipe - Remove (old) notifications from the spool'
-    parser = argparse.ArgumentParser(description=description)
+    parser = misc.ArgumentParser(description=description)
     parser.add_argument(
         '-p', '--project',
         help='ID of the Google Cloud project containing the spool. '

diff --git a/kcidb/tests/__init__.py b/kcidb/tests/__init__.py
@@ -1,6 +1,5 @@
 """Kernel CI reporting test catalog"""
 
-import argparse
 import sys
 import yaml
 import requests
@@ -12,7 +11,7 @@
 def validate_main():
     """Execute the kcidb-tests-validate command-line tool"""
     description = 'kcidb-tests-validate - Validate test catalog YAML'
-    parser = argparse.ArgumentParser(description=description)
+    parser = misc.ArgumentParser(description=description)
     parser.add_argument(
         "-u", "--urls",
         action='store_true',