kosmeticke zalezitosti, TODO

diff --git a/TODO b/TODO
index a0cf25f..f5ede79 100644 (file)
--- a/TODO
+++ b/TODO
@@ -18,3 +18,6 @@ morseovka
 neco na transpozice?
 podivat se jestli nekdo navazal na jakobsena
     (rozptyly, optimalita)
+
+==Technicke zalezitosti==
+prepsat tridy settings a reference tak, aby odpovidaly konvenci

diff --git a/robot.py b/robot.py
index 7992a53..ce6244f 100755 (executable)
--- a/robot.py
+++ b/robot.py
@@ -42,26 +42,26 @@ odesilatel = mail['From']
 if predmet != settings.subject:
     sys.exit()
 if opsny == 'H':
-    posli_mail(odesilatel, "Napoveda", "Napoveda:\n"
+    posli_mail(odesilatel, "Napoveda", ''.join("Napoveda:\n"
                "Prikazy robotovi vkladejte do predmetu zpravy "
-               "zaslane na adresu " + 
-               settings.mail + ".\nNa velikosti pismen nezalezi."
+               "zaslane na adresu ", 
+               settings.mail, ".\nNa velikosti pismen nezalezi."
                "\n\nSeznam prikazu:\n"
-               "\"" + settings.subject + "\"   Analyza zpravy z tela mailu.\n" 
-               "\"" + settings.subject + " L\" Opakovana analyza "
-               "posledni zpravy.\n" +
-               "\"" + settings.subject + " X\" Vynuti analyzu bez mezer.\n"
-               "\"" + settings.subject + " M\" Vynuti analyzu s mezerami.\n"
-               "\"" + settings.subject + " B\" Vypise cetnost vsech bigramu.\n"
-               "\"" + settings.subject + " P\" Vypise vsechny posunuti textu.\n"
-               "\"" + settings.subject + " A\" Vypise uplne vsechno co dava "
+               "\"", settings.subject, "\"   Analyza zpravy z tela mailu.\n" 
+               "\"", settings.subject, " L\" Opakovana analyza "
+               "posledni zpravy.\n",
+               "\"", settings.subject, " X\" Vynuti analyzu bez mezer.\n"
+               "\"", settings.subject, " M\" Vynuti analyzu s mezerami.\n"
+               "\"", settings.subject, " B\" Vypise cetnost vsech bigramu.\n"
+               "\"", settings.subject, " P\" Vypise vsechny posunuti textu.\n"
+               "\"", settings.subject, " A\" Vypise uplne vsechno co dava "
                "alespon trochu smysl (nedoporucuji).\n"
-               "\"" + settings.subject + " H\" Tato napoveda.\n"
+               "\"", settings.subject, " H\" Tato napoveda.\n"
                "\nVolby (mimo \"H\") je mozno libovolne kombinovat.\n"
-               "Napriklad \"" + settings.subject + " LXB\" analyzuje posledni "
+               "Napriklad \"", settings.subject, " LXB\" analyzuje posledni "
                "prijatou zpravu s vynucenim analyzy bez mezer a navic vypise "
                "cetnosti bigramu.\n"
-               "\nS pozdravem\nVas Robot\n")
+               "\nS pozdravem\nVas Robot\n"))
     sys.exit()
 if 'L' in opsny:
     mail = pickle.load(open('./msg_last.tmp'))
@@ -165,7 +165,7 @@ else:
     analyza.append(posunuty_text)
 
 # Bigramy
-if ('B' in opsny or 'A' in opsny):
+if 'B' in opsny or 'A' in opsny:
     analyza.append("\nBigramy podle cetnosti:")
     bigramy = dict()
     for i in ABECEDA: