Fix #5451 - add_message inconsistencies

[mediagoblin.git] / mediagoblin / tools / mail.py

diff --git a/mediagoblin/tools/mail.py b/mediagoblin/tools/mail.py
index ab3e0eaa374d598a886fe38cdcee99d0ab64bfc5..c11e392bc31ff05bfe7fe4bb3dc32969c5e174a4 100644 (file)
--- a/mediagoblin/tools/mail.py
+++ b/mediagoblin/tools/mail.py
@@ -137,7 +137,7 @@ def send_email(from_addr, to_addrs, subject, message_body):
         print("To addresses: %s" % message['To'])
         print("Subject: %s" % message['Subject'])
         print("-- Body: --")
-        print(message.get_payload(decode=True))
+        print(message_body)
 
     return mhost.sendmail(from_addr, to_addrs, message.as_string())
 
@@ -163,6 +163,8 @@ def email_debug_message(request):
     """
     if mg_globals.app_config['email_debug_mode']:
         # DEBUG message, no need to translate
-        messages.add_message(request, messages.DEBUG,
+        messages.add_message(
+            request,
+            messages.DEBUG,
             "This instance is running in email debug mode. "
             "The email will be on the console of the server process.")