From: Lowe Thiderman <redacted>
Date: Tue, 27 May 2014 22:16:44 +0000 (+0200)
Subject: Modify main code for packaging
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=9befa1649cd8d9ad5838d0d04c4242e0a1b53e3d;p=redacted-XKCD-password-generator.git

Modify main code for packaging

Add main() function that setuptools can use as an executable entry point.

Also pass the `parser` variable to `validate_options()`. Since the parser is
now created within the function scope of `main()` it cannot be seen by
`validate_options()` anymore.
---

diff --git a/xkcdpass/xkcd_password.py b/xkcdpass/xkcd_password.py
index 45530b2..76aeeb0 100755
--- a/xkcdpass/xkcd_password.py
+++ b/xkcdpass/xkcd_password.py
@@ -57,7 +57,7 @@ if sys.version[0] == "3":
     raw_input = input
 
 
-def validate_options(options, args):
+def validate_options(parser, options, args):
     """
     Given a set of command line options, performs various validation checks
     """
@@ -214,8 +214,7 @@ def generate_xkcdpassword(wordlist,
     return passwd
 
 
-if __name__ == '__main__':
-
+def main():
     count = 1
     usage = "usage: %prog [options]"
     parser = optparse.OptionParser(usage)
@@ -252,7 +251,7 @@ if __name__ == '__main__':
                       help="separator character between words")
 
     (options, args) = parser.parse_args()
-    validate_options(options, args)
+    validate_options(parser, options, args)
 
     my_wordlist = generate_wordlist(wordfile=options.wordfile,
                                     min_length=options.min_length,
@@ -272,3 +271,7 @@ if __name__ == '__main__':
                                     acrostic=options.acrostic,
                                     delim=options.delim))
         count -= 1
+
+
+if __name__ == '__main__':
+    main()