Fixup script structure for entrypoints

dkim/arcsign.py

@@ -35,6 +35,7 @@ import dkim
 
 logging.basicConfig(level=10)
 
+def main():
     if len(sys.argv) != 4:
         print("Usage: arcsign.py selector domain privatekeyfile", file=sys.stderr)
         sys.exit(1)
@@ -64,3 +65,6 @@ 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,6 +32,7 @@ import sys
 
 import dkim
 
+def main():
     if sys.version_info[0] >= 3:
         # Make sys.stdin a binary stream.
         sys.stdin = sys.stdin.detach()
@@ -48,3 +49,6 @@ else:
     print("arc verification: cv=%s %s" % (cv, comment))
     if verbose:
         print(repr(results))
+
+if __name__ == "__main__":
+    main()

dkim/dkimsign.py

@@ -29,6 +29,7 @@ import argparse
 
 import dkim
 
+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:]]
@@ -79,3 +80,6 @@ try:
     except Exception as e:
         print(e, file=sys.stderr)
         sys.stdout.write(message)
+
+if __name__ == "__main__":
+    main()

dkim/dkimverify.py

@@ -27,6 +27,7 @@ import sys
 
 import dkim
 
+def main():
     if sys.version_info[0] >= 3:
         # Make sys.stdin a binary stream.
         sys.stdin = sys.stdin.detach()
@@ -43,3 +44,6 @@ if not res:
         print("signature verification failed")
         sys.exit(1)
     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'),