bugfixes

diff --git a/robot.py b/robot.py
index 58fed48..daad9b8 100755 (executable)
--- a/robot.py
+++ b/robot.py
@@ -57,7 +57,17 @@ if opsny == 'H':
     sys.exit()
 if 'L' in opsny:
     mail = pickle.load(open('./msg_last.tmp'))
     sys.exit()
 if 'L' in opsny:
     mail = pickle.load(open('./msg_last.tmp'))

-    if ((re.match(r".*\<(.*)\>.*", mail['From']).group(1) or mail['From']) != (re.match(r".*\<(.*)\>.*", odesilatel).group(1) or odesilatel)):
+    m1 = re.match(r".*\<(.*)\>.*", mail['From'])
+    m2 = re.match(r".*\<(.*)\>.*", odesilatel)
+    if m1:
+        f1 = m1.group(1)
+    else:
+        f1 = mail['From']
+    if m2:
+        f2 = m2.group(1)
+    else:
+        f2 = odesilatel
+    if (f1 != f2):

         posli_mail(odesilatel, "Omluva", "Omlouvam se,"
                    " ale Vase zprava uz bohuzel neni na serveru ulozena.\n")
         sys.exit()
         posli_mail(odesilatel, "Omluva", "Omlouvam se,"
                    " ale Vase zprava uz bohuzel neni na serveru ulozena.\n")
         sys.exit()


@@ -129,11 +139,9 @@ if mod_x:
 
 # Posuny v abecede
 (posun, posunuty_text) = posuny.nejlepsi(zprava)
 
 # Posuny v abecede
 (posun, posunuty_text) = posuny.nejlepsi(zprava)

-
-

 if 'P' in opsny or 'A' in opsny:
     analyza.append("\nPosuny v abecede (nejlepsi posun {0}):".format(posun))
 if 'P' in opsny or 'A' in opsny:
     analyza.append("\nPosuny v abecede (nejlepsi posun {0}):".format(posun))

-    analyza.append("{0} {1}".format(i, posuny.vsechny(zprava)[i]) for i in range(26))
+    analyza.append("\n".join("{0} {1}".format(i + 1, posuny.vsechny(zprava)[i]) for i in range(26)))

 else:
     analyza.append("\nNejlepsi posun ({0}):".format(posun))
     analyza.append(posunuty_text)
 else:
     analyza.append("\nNejlepsi posun ({0}):".format(posun))
     analyza.append(posunuty_text)


@@ -181,6 +189,10 @@ pickle.dump(mail, f)
 f.close()
 
 f = open('./robot.log', 'a')
 f.close()
 
 f = open('./robot.log', 'a')

-odesilatel2 = re.match(r".*\<(.*)\>.*", odesilatel) or odesilatel
+m = re.match(r".*\<(.*)\>.*", odesilatel)
+if m:
+    odesilatel2 = m.group(1)
+else:
+    odesilatel2 = odesilatel

 f.write(asctime() + " " +  odesilatel2 + " " + opsny + "\n")
 f.close()
 f.write(asctime() + " " +  odesilatel2 + " " + opsny + "\n")
 f.close()