From e638424eeb65c99dc483688127f1650121205915 Mon Sep 17 00:00:00 2001 From: Isaac Gallart Date: Sat, 30 Jun 2018 02:06:36 +0200 Subject: [PATCH] [10.0][FIX] mail_sendgrid_mass_mailing: Bad import (#288) --- mail_sendgrid/README.rst | 1 + mail_sendgrid/__manifest__.py | 2 +- mail_sendgrid/models/mail_mail.py | 2 +- mail_sendgrid/models/sendgrid_template.py | 2 +- mail_sendgrid_mass_mailing/README.rst | 1 + mail_sendgrid_mass_mailing/__manifest__.py | 2 +- mail_sendgrid_mass_mailing/models/mail_mail.py | 5 ++--- 7 files changed, 8 insertions(+), 7 deletions(-) diff --git a/mail_sendgrid/README.rst b/mail_sendgrid/README.rst index 9de78760..7f0f8661 100644 --- a/mail_sendgrid/README.rst +++ b/mail_sendgrid/README.rst @@ -103,6 +103,7 @@ Contributors * Emanuel Cino * Roman Zoller +* Isaac Gallart Maintainer ---------- diff --git a/mail_sendgrid/__manifest__.py b/mail_sendgrid/__manifest__.py index f2c07e09..4e42d449 100644 --- a/mail_sendgrid/__manifest__.py +++ b/mail_sendgrid/__manifest__.py @@ -3,7 +3,7 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { 'name': 'SendGrid', - 'version': '10.0.1.0.1', + 'version': '10.0.1.0.2', 'category': 'Social Network', 'author': 'Compassion CH, Odoo Community Association (OCA)', 'license': 'AGPL-3', diff --git a/mail_sendgrid/models/mail_mail.py b/mail_sendgrid/models/mail_mail.py index 9d1b8503..d2ad5498 100644 --- a/mail_sendgrid/models/mail_mail.py +++ b/mail_sendgrid/models/mail_mail.py @@ -19,7 +19,7 @@ try: from sendgrid.helpers.mail import Email, Attachment, CustomArg, Content, \ Personalization, Substitution, Mail, Header except ImportError: - _logger.error("ImportError raised while loading module.") + _logger.warning("ImportError raised while loading module.") _logger.debug("ImportError details:", exc_info=True) diff --git a/mail_sendgrid/models/sendgrid_template.py b/mail_sendgrid/models/sendgrid_template.py index d96bf641..91a4ace7 100644 --- a/mail_sendgrid/models/sendgrid_template.py +++ b/mail_sendgrid/models/sendgrid_template.py @@ -15,7 +15,7 @@ _logger = logging.getLogger(__name__) try: import sendgrid except ImportError: - _logger.error("ImportError raised while loading module.") + _logger.warning("ImportError raised while loading module.") _logger.debug("ImportError details:", exc_info=True) diff --git a/mail_sendgrid_mass_mailing/README.rst b/mail_sendgrid_mass_mailing/README.rst index 41652f72..4c078672 100644 --- a/mail_sendgrid_mass_mailing/README.rst +++ b/mail_sendgrid_mass_mailing/README.rst @@ -63,6 +63,7 @@ Contributors ------------ * Emanuel Cino +* Isaac Gallart Do not contact contributors directly about support or help with technical issues. diff --git a/mail_sendgrid_mass_mailing/__manifest__.py b/mail_sendgrid_mass_mailing/__manifest__.py index cef66bcd..25d65e3f 100644 --- a/mail_sendgrid_mass_mailing/__manifest__.py +++ b/mail_sendgrid_mass_mailing/__manifest__.py @@ -3,7 +3,7 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { 'name': 'Mass Mailing with SendGrid', - 'version': '10.0.1.0.0', + 'version': '10.0.1.0.1', 'category': 'Social Network', 'author': 'Compassion CH, Odoo Community Association (OCA)', 'license': 'AGPL-3', diff --git a/mail_sendgrid_mass_mailing/models/mail_mail.py b/mail_sendgrid_mass_mailing/models/mail_mail.py index d75a1547..a27723e7 100644 --- a/mail_sendgrid_mass_mailing/models/mail_mail.py +++ b/mail_sendgrid_mass_mailing/models/mail_mail.py @@ -7,10 +7,9 @@ import logging _logger = logging.getLogger(__name__) try: - from sendgrid.helpers.mail.mail import TrackingSettings, \ - SubscriptionTracking + from sendgrid.helpers.mail import TrackingSettings, SubscriptionTracking except ImportError: - _logger.error("ImportError raised while loading module.") + _logger.warning("ImportError raised while loading module.") _logger.debug("ImportError details:", exc_info=True)