projekty
/
krypto.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
4bebeac
)
bugfix
author
Tomas Musil
<tomik.musil@gmail.com>
Thu, 22 Mar 2012 13:39:10 +0000
(14:39 +0100)
committer
Tomas Musil
<tomik.musil@gmail.com>
Thu, 22 Mar 2012 13:39:10 +0000
(14:39 +0100)
robot.py
patch
|
blob
|
history
diff --git
a/robot.py
b/robot.py
index
98792db
..
a49c337
100755
(executable)
--- a/
robot.py
+++ b/
robot.py
@@
-22,12
+22,16
@@
class settings:
settings = pickle.load(open('./robot_settings'))
os.chdir(settings.path)
settings = pickle.load(open('./robot_settings'))
os.chdir(settings.path)
-def posli_mail(komu, co, text):
+def posli_mail(komu, co, text
, loguj=None
):
msg = MIMEText(text)
msg['Subject'] = co
msg['From'] = settings.name + " <" + settings.mail + ">"
msg['To'] = komu
smtplib.SMTP('localhost').sendmail(settings.mail, komu, msg.as_string())
msg = MIMEText(text)
msg['Subject'] = co
msg['From'] = settings.name + " <" + settings.mail + ">"
msg['To'] = komu
smtplib.SMTP('localhost').sendmail(settings.mail, komu, msg.as_string())
+ if loguj:
+ f = open(loguj, 'w')
+ f.write(msg.as_string())
+ f.close()
# Cteni mailu
mail = email.message_from_file(sys.stdin)
# Cteni mailu
mail = email.message_from_file(sys.stdin)
@@
-169,12
+173,7
@@
analyza.append(''.join(["\nS pozdravem\nVas Robot\n"
settings.subject," H\".\n"]))
# Odeslani odpovedi
settings.subject," H\".\n"]))
# Odeslani odpovedi
-posli_mail(odesilatel, "Analyza Vasi zpravy", "\n".join(analyza))
-
-# Zalogovani posledni zpravy
-f = open('./robot_last.tmp', 'w')
-f.write(msg.as_string())
-f.close()
+posli_mail(odesilatel, "Analyza Vasi zpravy", "\n".join(analyza), './robot_last.tmp')
f = open('./msg_last.tmp', 'w')
pickle.dump(mail, f)
f = open('./msg_last.tmp', 'w')
pickle.dump(mail, f)