Merge branch 'temp-solutions' into solutions

diff --git a/cipher.py b/cipher.py
index c5b29f0c05f93ef228655a37d2e92887b26fc5f6..68472bee600516a5e58d5005e2933bc9765ef567 100644 (file)
--- a/cipher.py
+++ b/cipher.py
@@ -3,10 +3,7 @@ them. See cipherbreak for automatic breaking of these ciphers
 """
 
 import string
-# import collections
-# from enum import Enum
-# from itertools import zip_longest, cycle, chain
-
+import collections
 from language_models import unaccent, sanitise
 
 

diff --git a/language_models.py b/language_models.py
index 0ee039496d17639278f268cc3d3c8f1feab0d0aa..b84e43cc3e185b90bac4b540b4dacf7822b23539 100644 (file)
--- a/language_models.py
+++ b/language_models.py
@@ -3,6 +3,8 @@ its use.
 """
 
 import string
+import norms
+import collections
 import unicodedata
 
 def letters(text):
@@ -49,7 +51,6 @@ def sanitise(text):
     return letters(unaccent(text)).lower()
 
 
-
 if __name__ == "__main__":
     import doctest
     doctest.testmod()