Done 2017 challenge 5

[cipher-tools.git] / make-cracking-dictionary.py

diff --git a/make-cracking-dictionary.py b/make-cracking-dictionary.py
index 2c94ff2341d0d98a6e8bcbe0f2c46fc393ed3730..37de917608fb63b9f730fcf04cfc8c86035e7e58 100644 (file)
--- a/make-cracking-dictionary.py
+++ b/make-cracking-dictionary.py
@@ -1,4 +1,4 @@
-import cipher
+import language_models
 
 american = set(open('/usr/share/dict/american-english', 'r').readlines())
 british = set(open('/usr/share/dict/british-english', 'r').readlines())
@@ -6,22 +6,14 @@ cracklib = set(open('/usr/share/dict/cracklib-small', 'r').readlines())
 
 words = american | british | cracklib
 
-sanitised_words = set()
+# sanitised_words = set()
 
-for w in words:
-    sanitised_words.add(cipher.sanitise(w))
+# for w in words:
+    # sanitised_words.add(language_models.sanitise(w))
     
+sanitised_words = set(language_models.sanitise(w) for w in words)
+
 sanitised_words.discard('')
 
 with open('words.txt', 'w') as f:
     f.write('\n'.join(sorted(sanitised_words, key=lambda w: (len(w), w))))
-    #for w in sanitised_words:
-        #f.write('{0}\n'.format(w))
-
-
-    
-
-
-
-
-