diff options
author | Jörg Frings-Fürst <debian@jff.email> | 2019-07-14 10:10:27 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff.email> | 2019-07-14 10:10:27 +0200 |
commit | 85a84567ef0c2f0949953d81929ce7794fbcad2d (patch) | |
tree | da63e80e3ea0d9e0d4a45e60e75960ffb58b1835 /mwc.py | |
parent | 5b672f2e2521b0f0e932c9b3d76b1f2db27c7201 (diff) | |
parent | 4fa0bf4b0c3644078fb9b5c3e7f604f6f6e442d2 (diff) |
Update upstream source from tag 'upstream/2.0.5'
Update to upstream version '2.0.5'
with Debian dir da8d3ecbd521f52ac641e3c966f4a5e22b64aaeb
Diffstat (limited to 'mwc.py')
-rwxr-xr-x | mwc.py | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -4,6 +4,8 @@ # Copyright: (2013-2017) Michael Till Beck <Debianguru@gmx.de> # License: GPL-2.0+ +#test + import io from lxml import etree import hashlib @@ -78,7 +80,7 @@ def sendmail(receiver, subject, content, sendAsHtml, link, encoding=None): else: if link is not None: content = link + '\n\n' + content - mail = MIMEText(content, 'text', encoding) + mail = MIMEText(content, 'plain', encoding) mail['From'] = config.sender mail['To'] = receiver @@ -93,7 +95,7 @@ def sendmail(receiver, subject, content, sendAsHtml, link, encoding=None): if config.smtpusername is not None: mailsession.login(config.smtpusername, config.smtppwd) - mailsession.sendmail(config.sender, receiver.split(','), mail.as_string()) + mailsession.send_message(mail) # returns a list of all content that is stored locally for a specific site @@ -170,7 +172,7 @@ def pollWebsites(): sessionHashes.append(contenthash) changedContents.append(content) - subject = '[' + site['name'] + '] ' + content.title + subject = '[' + site['name'] + '] ' + ("Update available" if content.title is None else content.title) print(' ' + subject) if config.enableMailNotifications and len(fileHashes) > 0: sendAsHtml = (content.contenttype == 'html') |