Fixup script structure for entrypoints

dkim/arcsign.py

@@ -35,32 +35,36 @@ import dkim
 
 logging.basicConfig(level=10)
 
-if len(sys.argv) != 4:
+def main():
+    if len(sys.argv) != 4:
         print("Usage: arcsign.py selector domain privatekeyfile", file=sys.stderr)
         sys.exit(1)
 
-if sys.version_info[0] >= 3:
+    if sys.version_info[0] >= 3:
         # Make sys.stdin and stdout binary streams.
         sys.stdin = sys.stdin.detach()
         sys.stdout = sys.stdout.detach()
 
-selector = sys.argv[1].encode('ascii')
-domain = sys.argv[2].encode('ascii')
-privatekeyfile = sys.argv[3]
+    selector = sys.argv[1].encode('ascii')
+    domain = sys.argv[2].encode('ascii')
+    privatekeyfile = sys.argv[3]
 
-message = sys.stdin.read()
+    message = sys.stdin.read()
 
-# Pick a cv status
-cv = dkim.CV_None
-if re.search('arc-seal', message, re.IGNORECASE):
+    # Pick a cv status
+    cv = dkim.CV_None
+    if re.search('arc-seal', message, re.IGNORECASE):
         cv = dkim.CV_Pass
 
-#try:
-sig = dkim.arc_sign(message, selector, domain, open(privatekeyfile, "rb").read(),
+    #try:
+    sig = dkim.arc_sign(message, selector, domain, open(privatekeyfile, "rb").read(),
                    domain + ": none", cv)
-for line in sig:
+    for line in sig:
         sys.stdout.write(line)
-sys.stdout.write(message)
-#except Exception as e:
-#    print(e, file=sys.stderr)
+    sys.stdout.write(message)
+    #except Exception as e:
+    #    print(e, file=sys.stderr)
         #sys.stdout.write(message)
+
+if __name__ == "__main__":
+    main()

dkim/arcverify.py

@@ -32,19 +32,23 @@ import sys
 
 import dkim
 
-if sys.version_info[0] >= 3:
+def main():
+    if sys.version_info[0] >= 3:
         # Make sys.stdin a binary stream.
         sys.stdin = sys.stdin.detach()
 
-message = sys.stdin.read()
-verbose = '-v' in sys.argv
-if verbose:
+    message = sys.stdin.read()
+    verbose = '-v' in sys.argv
+    if verbose:
         logging.basicConfig(level=10)
         a = dkim.ARC(message)
         cv, results, comment = a.verify()
-else:
+    else:
         cv, results, comment = dkim.arc_verify(message)
 
-print("arc verification: cv=%s %s" % (cv, comment))
-if verbose:
+    print("arc verification: cv=%s %s" % (cv, comment))
+    if verbose:
         print(repr(results))
+
+if __name__ == "__main__":
+    main()

dkim/dkimsign.py

@@ -29,31 +29,32 @@ import argparse
 
 import dkim
 
-# Backward compatibility hack because argparse doesn't support optional
-# positional arguments
-arguments=['--'+arg if arg[:8] == 'identity' else arg for arg in sys.argv[1:]]
-parser = argparse.ArgumentParser(
+def main():
+    # Backward compatibility hack because argparse doesn't support optional
+    # positional arguments
+    arguments=['--'+arg if arg[:8] == 'identity' else arg for arg in sys.argv[1:]]
+    parser = argparse.ArgumentParser(
         description='Produce DKIM signature for email messages.',
         epilog="message to be signed follows commands on stdin")
-parser.add_argument('selector', action="store")
-parser.add_argument('domain', action="store")
-parser.add_argument('privatekeyfile', action="store")
-parser.add_argument('--hcanon', choices=['simple', 'relaxed'],
+    parser.add_argument('selector', action="store")
+    parser.add_argument('domain', action="store")
+    parser.add_argument('privatekeyfile', action="store")
+    parser.add_argument('--hcanon', choices=['simple', 'relaxed'],
         default='relaxed',
         help='Header canonicalization algorithm: default=relaxed')
-parser.add_argument('--bcanon', choices=['simple', 'relaxed'],
+    parser.add_argument('--bcanon', choices=['simple', 'relaxed'],
         default='simple',
         help='Body canonicalization algorithm: default=simple')
-parser.add_argument('--signalg', choices=['rsa-sha256', 'ed25519-sha256', 'rsa-sha1'],
+    parser.add_argument('--signalg', choices=['rsa-sha256', 'ed25519-sha256', 'rsa-sha1'],
         default='rsa-sha256',
         help='Signature algorithm: default=rsa-sha256')
-parser.add_argument('--identity', help='Optional value for i= tag.')
-args=parser.parse_args(arguments)
-include_headers = None
-length = None
-logger = None
+    parser.add_argument('--identity', help='Optional value for i= tag.')
+    args=parser.parse_args(arguments)
+    include_headers = None
+    length = None
+    logger = None
 
-if sys.version_info[0] >= 3:
+    if sys.version_info[0] >= 3:
         args.selector = bytes(args.selector, encoding='UTF-8')
         args.domain = bytes(args.domain, encoding='UTF-8')
         if args.identity is not None:
@@ -64,10 +65,10 @@ if sys.version_info[0] >= 3:
         # Make sys.stdin and stdout binary streams.
         sys.stdin = sys.stdin.detach()
         sys.stdout = sys.stdout.detach()
-canonicalize = (args.hcanon, args.bcanon)
+    canonicalize = (args.hcanon, args.bcanon)
 
-message = sys.stdin.read()
-try:
+    message = sys.stdin.read()
+    try:
         d = dkim.DKIM(message,logger=logger,
                       signature_algorithm=args.signalg)
         sig = d.sign(args.selector, args.domain, open(
@@ -76,6 +77,9 @@ try:
                      length=length)
         sys.stdout.write(sig)
         sys.stdout.write(message)
-except Exception as e:
+    except Exception as e:
         print(e, file=sys.stderr)
         sys.stdout.write(message)
+
+if __name__ == "__main__":
+    main()

dkim/dkimverify.py

@@ -27,19 +27,23 @@ import sys
 
 import dkim
 
-if sys.version_info[0] >= 3:
+def main():
+    if sys.version_info[0] >= 3:
         # Make sys.stdin a binary stream.
         sys.stdin = sys.stdin.detach()
 
-message = sys.stdin.read()
-verbose = '-v' in sys.argv
-if verbose:
+    message = sys.stdin.read()
+    verbose = '-v' in sys.argv
+    if verbose:
         import logging
         d = dkim.DKIM(message, logger=logging)
         res = d.verify()
-else:
+    else:
         res = dkim.verify(message)
-if not res:
+    if not res:
         print("signature verification failed")
         sys.exit(1)
-print("signature ok")
+    print("signature ok")
+
+if __name__ == "__main__":
+    main()

dkim/dknewkey.py

@@ -90,7 +90,7 @@ def ExtractEd25519PublicKey(private_key_file, dns_file, priv_key):
     print >> dns_fp, "k=ed25519; p={0}".format(output)
     dns_fp.close()
 
-def main(argv):
+def main():
   parser = argparse.ArgumentParser(
     description='Produce DKIM keys.',)
   parser.add_argument('key_name', action="store")
@@ -121,4 +121,4 @@ def main(argv):
 
 
 if __name__ == '__main__':
-  main(sys.argv)
+  main()

setup.py

@@ -41,11 +41,11 @@ verification.""",
     packages = ["dkim"],
     entry_points = {
         'console_scripts' : [
-            'arcsign = dkim.arcsign',
-            'arverify = dkim.arcverify',
-            'dkimgsign = dkim.dkimsign',
-            'dkimverify = dkim.dkimverify',
-            'dknewkey = dkim.dknewkey'
+            'arcsign = dkim.arcsign:main',
+            'arverify = dkim.arcverify:main',
+            'dkimgsign = dkim.dkimsign:main',
+            'dkimverify = dkim.dkimverify:main',
+            'dknewkey = dkim.dknewkey:main'
         ],
     },
     data_files = [(os.path.join('share', 'man', 'man1'),