Merge ~dkg0/dkimpy:argparse into dkimpy:master

[dkg]

Unmerged commits

4938ad4... by dkg on 2020-10-13

dkimverify: handle -v (and --verbose) via argparse

diff --git a/dkim/dkimverify.py b/dkim/dkimverify.py
index 2ca90d5..5001eb6 100644
--- a/dkim/dkimverify.py
+++ b/dkim/dkimverify.py
@@ -32,6 +32,8 @@ def main():
     parser = argparse.ArgumentParser(
         description='Verify DKIM signature for email messages.',
         epilog="message to be verified follows commands on stdin")
+    parser.add_argument('-v', '--verbose', action='store_true',
+                        help='Show verbose information')
     parser.add_argument('--index', metavar='N', type=int, default=0,
         help='Index of DKIM signature header to verify: default=0')
     args=parser.parse_args()
@@ -40,8 +42,7 @@ def main():
         sys.stdin = sys.stdin.detach()
 
     message = sys.stdin.read()
-    verbose = '-v' in sys.argv
-    if verbose:
+    if args.verbose:
         import logging
         d = dkim.DKIM(message, logger=logging)
     else:
diff --git a/man/dkimverify.1 b/man/dkimverify.1
index 2b13d89..b523be3 100644
--- a/man/dkimverify.1
+++ b/man/dkimverify.1
@@ -145,8 +145,9 @@ code 1.
 usage: dkimverify.py [\-h] [\-\-index N] <message
 
 optional arguments:
-  \-h, \-\-help  show this help message and exit
-  \-\-index N   Index of DKIM signature header to verify: default=0
+  \-h, \-\-help     show this help message and exit
+  \-v, \-\-verbose  provide more verbose output
+  \-\-index N      Index of DKIM signature header to verify: default=0
 
 .SH "AUTHORS"
 This version of \fBdkimverify\fR was written by Greg Hewgill <[e-mail]>.