Merge tag 'upstream/1.7.5'

Upstream version 1.7.5

1 files changed, 4 insertions, 1 deletions

diff --git a/mwc.py b/mwc.py
index 606f504..a0635a1 100755
--- a/mwc.py
+++ b/mwc.py
@@ -90,6 +90,8 @@ def parseSite(site):
                         req = urllib.request.Request(uri)
                         if 'user-agent' in site:
                             req.add_header('User-Agent', site['user-agent'])
+                        if 'accept' in site:
+                            req.add_header('Accept', site['accept'])
                         file = urllib.request.urlopen(req)
 
 
@@ -228,7 +230,8 @@ def sendmail(receiver, subject, content, sendAsHtml, link):
                 if config.useTLS:
                         mailsession.ehlo()
                         mailsession.starttls()
-                mailsession.login(config.smtpusername, config.smtppwd)
+                if config.smtpusername is not None:
+                    mailsession.login(config.smtpusername, config.smtppwd)
 
         mailsession.sendmail(config.sender, receiver.split(','), mail.as_string())