diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-05-12 14:59:08 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-05-12 14:59:08 -0500 |
| commit | f62ccaac15728cca6dfef40ebc3c63b367f38cbf (patch) | |
| tree | 2a25eb4e2110d102cd6d33d6ba3b399bc2f283e2 /mediagoblin/util.py | |
| parent | 8b28bee4c1de6f1190091f5c17c0cf0f948c7071 (diff) | |
| parent | 21919313dfc18c9f9303cbbb2591c0410379f768 (diff) | |
| download | mediagoblin-f62ccaac15728cca6dfef40ebc3c63b367f38cbf.tar.lz mediagoblin-f62ccaac15728cca6dfef40ebc3c63b367f38cbf.tar.xz mediagoblin-f62ccaac15728cca6dfef40ebc3c63b367f38cbf.zip | |
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
Conflicts:
mediagoblin/util.py
Diffstat (limited to 'mediagoblin/util.py')
| -rw-r--r-- | mediagoblin/util.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mediagoblin/util.py b/mediagoblin/util.py index 2b7948c8..f02b5f51 100644 --- a/mediagoblin/util.py +++ b/mediagoblin/util.py @@ -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()) ################### |