X-Git-Url: https://git.njae.me.uk/?a=blobdiff_plain;f=szyfrow%2Famsco.py;h=48ab30627b7c46f472b526a2fcbd4cfbe3c05b6c;hb=deed628b25281baff05b8ec8310a7458ac298d7b;hp=3d4e49b6ac1df23f8144de3e9a9da48e875b80aa;hpb=a870050db6bc974b1bb0d132001750b6624fb43f;p=szyfrow.git

diff --git a/szyfrow/amsco.py b/szyfrow/amsco.py
index 3d4e49b..48ab306 100644
--- a/szyfrow/amsco.py
+++ b/szyfrow/amsco.py
@@ -2,11 +2,9 @@ from enum import Enum
 import multiprocessing 
 import itertools
 
-from support.utilities import *
-from support.language_models import *
-from cipher.column_transposition import transpositions, transpositions_of
-
-from logger import logger
+from szyfrow.support.utilities import *
+from szyfrow.support.language_models import *
+from szyfrow.column_transposition import transpositions, transpositions_of
 
 # Where each piece of text ends up in the AMSCO transpositon cipher.
 # 'index' shows where the slice appears in the plaintext, with the slice
@@ -193,11 +191,6 @@ def amsco_break_worker(message, transposition,
     plaintext = amsco_transposition_decipher(message, transposition,
         fillpattern=pattern, fillstyle=fillstyle)
     fit = fitness(sanitise(plaintext))
-    logger.debug('AMSCO transposition break attempt using key {0} and pattern'
-                         '{1} ({2}) gives fit of {3} and decrypt starting: '
-                         '{4}'.format(
-                             transposition, pattern, fillstyle, fit, 
-                             sanitise(plaintext)[:50]))
     return (transposition, pattern, fillstyle), fit
 
 if __name__ == "__main__":