diff --git a/fetchmail_incoming_log/__manifest__.py b/fetchmail_incoming_log/__manifest__.py index d2c7b0fd2..a3dbce0f0 100644 --- a/fetchmail_incoming_log/__manifest__.py +++ b/fetchmail_incoming_log/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Fetchmail Incoming Log", - "version": "13.0.1.0.0", + "version": "14.0.1.0.0", "category": "Tools", "summary": "Log all messages received, before they start to be processed.", "author": "ForgeFlow, Odoo Community Association (OCA)", diff --git a/fetchmail_incoming_log/models/mail_thread.py b/fetchmail_incoming_log/models/mail_thread.py index 88af8bc7d..5b4c3d85e 100644 --- a/fetchmail_incoming_log/models/mail_thread.py +++ b/fetchmail_incoming_log/models/mail_thread.py @@ -2,6 +2,7 @@ # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). import email +import email.policy import logging import xmlrpc.client as xmlrpclib @@ -26,9 +27,10 @@ class MailThread(models.AbstractModel): message_copy = message if isinstance(message, xmlrpclib.Binary): message = bytes(message.data) + if isinstance(message, str): message = message.encode("utf-8") - message = email.message_from_bytes(message) + message = email.message_from_bytes(message, policy=email.policy.SMTP) msg_dict = self.message_parse(message, save_original=save_original) _logger.info( "Fetched mail from %s to %s with Message-Id %s", @@ -37,7 +39,7 @@ class MailThread(models.AbstractModel): msg_dict.get("message_id"), ) - return super(MailThread, self).message_process( + return super().message_process( model, message_copy, custom_values=custom_values, diff --git a/fetchmail_incoming_log/readme/CONTRIBUTORS.rst b/fetchmail_incoming_log/readme/CONTRIBUTORS.rst index 1f463e7a5..1ec5d4760 100644 --- a/fetchmail_incoming_log/readme/CONTRIBUTORS.rst +++ b/fetchmail_incoming_log/readme/CONTRIBUTORS.rst @@ -1,2 +1,3 @@ * Jordi Ballester * Héctor Villarreal +* Helly kapatel diff --git a/fetchmail_incoming_log/tests/test_fetchmail_incoming_log.py b/fetchmail_incoming_log/tests/test_fetchmail_incoming_log.py index 3d57c3650..6fb193a9a 100644 --- a/fetchmail_incoming_log/tests/test_fetchmail_incoming_log.py +++ b/fetchmail_incoming_log/tests/test_fetchmail_incoming_log.py @@ -1,7 +1,6 @@ # Copyright 2017-20 ForgeFlow S.L. (www.forgeflow.com) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). - from odoo.tests.common import tagged from odoo.addons.test_mail.data.test_mail_data import MAIL_TEMPLATE