From: Steven Tobin <tobin2402 (at) gmail.com>
Date: Sat, 2 Jun 2012 13:40:26 +0000 (+0100)
Subject: expanded doc for generate_wordlist
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=a8d923fea866c7930929f2b268104538ea4c98bc;p=redacted-XKCD-password-generator.git

expanded doc for generate_wordlist
---

diff --git a/xkcd-password.py b/xkcd-password.py
index 15eb27b..abf5450 100755
--- a/xkcd-password.py
+++ b/xkcd-password.py
@@ -49,12 +49,10 @@ except AttributeError:
 
     rng = random.Random
 
-def generate_wordlist(wordfile=None,
-                      min_length=5,
-                      max_length=9,
-                      valid_chars='.'):
+def generate_wordlist(wordfile=None, min_length=5, max_length=9, valid_chars='.'):
     """
     generate a word list from either a kwarg word_file, or a system default
+    valid_chars is a regular expression match condition (default - all chars)
     """
 
     if wordfile is None:
@@ -90,11 +88,9 @@ def report_entropy(length, numwords):
     """
     bits = math.log(length, 2)
     if (int(bits) == bits):
-        print("Your word list contains %i words, or 2^%i words. " %
-             (length, bits))
+        print("Your word list contains %i words, or 2^%i words. " % (length, bits))
     else:
-        print("Your word list contains %i words, or 2^%0.2f words. " %
-             (length, bits))
+        print("Your word list contains %i words, or 2^%0.2f words. " % (length, bits))
 
     print("A %i word password from this list will have roughly"
            "%i (%0.2f * %i) bits of entropy," %