From: Steven Tobin <steventtobin (at) gmail.com>
Date: Tue, 11 Jun 2013 12:43:31 +0000 (+0100)
Subject: removed dependence on options parsing for verbose_reports
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=1e405d0ec5664c4b452a6e1f40d693bf46d64226;p=redacted-XKCD-password-generator.git

removed dependence on options parsing for verbose_reports
---

diff --git a/xkcd_password.py b/xkcd_password.py
index b201734..d47c886 100755
--- a/xkcd_password.py
+++ b/xkcd_password.py
@@ -126,16 +126,15 @@ def generate_wordlist(wordfile=None,
     return words
 
 
-def verbose_reports(length, options):
+def verbose_reports(length, numwords, wordfile):
     """
     Report entropy metrics based on word list and requested password size"
     """
 
-    numwords = options.numwords
     bits = math.log(length, 2)
 
     print("The supplied word list is located at %s."
-          % os.path.abspath(options.wordfile))
+          % os.path.abspath(wordfile))
 
     if (int(bits) == bits):
         print("Your word list contains %i words, or 2^%i words."
@@ -145,7 +144,7 @@ def verbose_reports(length, options):
               % (length, bits))
 
     print("A %i word password from this list will have roughly "
-          "%i (%0.2f * %i) bits of entropy, " %
+          "%i (%0.2f * %i) bits of entropy," %
           (numwords, int(bits * numwords), bits, numwords)),
     print("assuming truly random word selection.")
 
@@ -251,7 +250,9 @@ if __name__ == '__main__':
                                     valid_chars=options.valid_chars)
 
     if options.verbose:
-        verbose_reports(len(my_wordlist), options)
+        verbose_reports(len(my_wordlist),
+                        options.numwords,
+                        options.wordfile)
 
     count = options.count
     while count > 0: