Mercurial > hg > gcmultimerge
comparison multimerge.py @ 71:41881ba09ba8
Allow setting SMTP server .. needs more work tho.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Tue, 12 Jul 2016 10:27:38 +0300 |
parents | d5e3ca4b609d |
children | 1ab40033bb87 |
comparison
equal
deleted
inserted
replaced
70:d5e3ca4b609d | 71:41881ba09ba8 |
---|---|
58 msg.set_charset("UTF-8") | 58 msg.set_charset("UTF-8") |
59 msg["Subject"] = cfg.email_subject | 59 msg["Subject"] = cfg.email_subject |
60 msg["From"] = cfg.email_sender | 60 msg["From"] = cfg.email_sender |
61 msg["To"] = ",".join(cfg.email_to) | 61 msg["To"] = ",".join(cfg.email_to) |
62 try: | 62 try: |
63 smtpH = smtplib.SMTP('localhost') | 63 smtpH = smtplib.SMTP(cfg.email_server) |
64 smtpH.sendmail(cfg.email_sender, cfg.email_to, msg.as_string()) | 64 smtpH.sendmail(cfg.email_sender, cfg.email_to, msg.as_string()) |
65 smtpH.quit() | 65 smtpH.quit() |
66 except Exception as e: | 66 except Exception as e: |
67 gcm_print(u"FATAL: Oh crap, e-mail sending failed: {0}".format(str(e))) | 67 gcm_print(u"FATAL: Oh crap, e-mail sending failed: {0}".format(str(e))) |
68 sys.exit(1) | 68 sys.exit(1) |
337 cfg.mdef("email_ok", False, None, None, False) | 337 cfg.mdef("email_ok", False, None, None, False) |
338 cfg.mdef("email", True, cfg.is_bool, cfg.trans_bool, False) | 338 cfg.mdef("email", True, cfg.is_bool, cfg.trans_bool, False) |
339 cfg.mdef("email_to", True, cfg.is_email_list, cfg.trans_email_list, None) | 339 cfg.mdef("email_to", True, cfg.is_email_list, cfg.trans_email_list, None) |
340 cfg.mdef("email_sender", True, cfg.is_email, None, None) | 340 cfg.mdef("email_sender", True, cfg.is_email, None, None) |
341 cfg.mdef("email_subject", True, cfg.is_string, None, u"Google Calendar MultiMerge status") | 341 cfg.mdef("email_subject", True, cfg.is_string, None, u"Google Calendar MultiMerge status") |
342 cfg.mdef("email_server", True, cfg.is_string, None, None) | |
342 | 343 |
343 cfg.mdef("source_regex", True, cfg.is_string, None, u"^R:\s*(.*?)\s*\(\s*(.+?)\s*\)\s*$") | 344 cfg.mdef("source_regex", True, cfg.is_string, None, u"^R:\s*(.*?)\s*\(\s*(.+?)\s*\)\s*$") |
344 cfg.mdef("source_regmap", False, cfg.is_list, cfg.trans_list, [1, 2]) | 345 cfg.mdef("source_regmap", False, cfg.is_list, cfg.trans_list, [1, 2]) |
345 cfg.mdef("source_regmap_len", False, None, None, len(cfg.source_regmap)) | 346 cfg.mdef("source_regmap_len", False, None, None, len(cfg.source_regmap)) |
346 | 347 |