heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin

Browse Source 
Conflicts:
	mediagoblin/util.py
This commit is contained in:
Christopher Allan Webber 2011-05-12 14:59:08 -05:00
commit f62ccaac15
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mediagoblin/util.py
View File

@ -172,7 +172,7 @@ def send_email(from_addr, to_addrs, subject, message_body):
if TESTS_ENABLED:
EMAIL_TEST_INBOX.append(message)
elif mgoblin_globals.email_debug_mode:
if getattr(mgoblin_globals, 'email_debug_mode', False):
print u"===== Email ====="
print u"From address: %s" % message['From']
print u"To addresses: %s" % message['To']
@ -180,8 +180,7 @@ def send_email(from_addr, to_addrs, subject, message_body):
print u"-- Body: --"
print message.get_payload(decode=True)
else:
return mhost.sendmail(from_addr, to_addrs, message.as_string())
return mhost.sendmail(from_addr, to_addrs, message.as_string())
###################