From fa4adeb3749839fd30a5b46ab14d2e5674d5c057 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Wed, 26 Feb 2020 17:05:53 +0000 Subject: [PATCH] Fixed a number of bad Message.content_type settings. - Legacy-Id: 17339 --- ietf/ipr/mail.py | 5 +++-- ietf/nomcom/tests.py | 2 +- ietf/secr/drafts/email.py | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ietf/ipr/mail.py b/ietf/ipr/mail.py index 1f4497e7e..ec875b05a 100644 --- a/ietf/ipr/mail.py +++ b/ietf/ipr/mail.py @@ -1,4 +1,4 @@ -# Copyright The IETF Trust 2014-2019, All Rights Reserved +# Copyright The IETF Trust 2014-2020, All Rights Reserved # -*- coding: utf-8 -*- @@ -165,7 +165,8 @@ def message_from_message(message,by=None): bcc = message.get('bcc',''), reply_to = message.get('reply_to',''), body = get_body(message), - time = utc_from_string(message['date']) + time = utc_from_string(message['date']), + content_type = message.get('content_type', 'text/plain'), ) return msg diff --git a/ietf/nomcom/tests.py b/ietf/nomcom/tests.py index e0fa03e4f..f757ea570 100644 --- a/ietf/nomcom/tests.py +++ b/ietf/nomcom/tests.py @@ -502,7 +502,7 @@ class NomcomViewsTest(TestCase): to="test@example.com", frm="nomcomchair@example.com", body="Hello World!", - content_type="", + content_type="text/plain", ) msg.related_groups.add(nomcom) diff --git a/ietf/secr/drafts/email.py b/ietf/secr/drafts/email.py index 728479e30..0496e89ab 100644 --- a/ietf/secr/drafts/email.py +++ b/ietf/secr/drafts/email.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2013-2020, All Rights Reserved import datetime import glob import os @@ -20,7 +21,7 @@ def announcement_from_form(data, **kwargs): # possible overrides by = kwargs.get('by',Person.objects.get(name='(System)')) from_val = kwargs.get('from_val','Datatracker ') - content_type = kwargs.get('content_type','') + content_type = kwargs.get('content_type','text/plain') # from the form subject = data['subject']