aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/util.py
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2011-05-07 22:45:06 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2011-05-07 22:45:06 -0500
commit29f3fb7052a0a512d5970a936b30175b9c7eef63 (patch)
tree2fd223953830baba7285cdd01badb4ac0ecb8861 /mediagoblin/util.py
parent3eae207c54b6c8fa4c2e122403b4462d93b8b713 (diff)
downloadmediagoblin-29f3fb7052a0a512d5970a936b30175b9c7eef63.tar.lz
mediagoblin-29f3fb7052a0a512d5970a936b30175b9c7eef63.tar.xz
mediagoblin-29f3fb7052a0a512d5970a936b30175b9c7eef63.zip
Added an email debug mode which, by default, is enabled
Diffstat (limited to 'mediagoblin/util.py')
-rw-r--r--mediagoblin/util.py17
1 files changed, 14 insertions, 3 deletions
diff --git a/mediagoblin/util.py b/mediagoblin/util.py
index d24b59b6..8695180a 100644
--- a/mediagoblin/util.py
+++ b/mediagoblin/util.py
@@ -21,6 +21,8 @@ import sys
import jinja2
import mongokit
+from mediagoblin import globals as mgoblin_globals
+
TESTS_ENABLED = False
def _activate_testing():
@@ -153,9 +155,9 @@ def send_email(from_addr, to_addrs, subject, message_body):
- message_body: email body text
"""
# TODO: make a mock mhost if testing is enabled
- if TESTS_ENABLED:
+ if TESTS_ENABLED or mgoblin_globals.email_debug_mode:
mhost = FakeMhost()
- else:
+ elif not mgoblin_globals.email_debug_mode:
mhost = smtplib.SMTP()
mhost.connect()
@@ -168,4 +170,13 @@ def send_email(from_addr, to_addrs, subject, message_body):
if TESTS_ENABLED:
EMAIL_TEST_INBOX.append(message)
- return mhost.sendmail(from_addr, to_addrs, message.as_string())
+ elif mgoblin_globals.email_debug_mode:
+ print u"===== Email ====="
+ print u"From address: %s" % message['From']
+ print u"To addresses: %s" % message['To']
+ print u"Subject: %s" % message['Subject']
+ print u"-- Body: --"
+ print message.get_payload(decode=True)
+
+ else:
+ return mhost.sendmail(from_addr, to_addrs, message.as_string())