From fee3cd45b1193789fe9c6217675a5ff0ca9a1590 Mon Sep 17 00:00:00 2001 From: Ivan Yelizariev Date: Wed, 12 Feb 2020 08:53:51 +0000 Subject: [PATCH] :green_heart: fix old imports --- mail_base/controllers/main.py | 4 ++-- mail_base/models.py | 2 +- mail_check_immediately/models.py | 4 ++-- mail_fix_553/mail_fix_553.py | 10 +++++----- mailgun/models/ir_config_parameter.py | 2 +- res_partner_company_messages/models.py | 2 +- res_partner_mails_count/models.py | 2 +- res_partner_mails_count/tests/test_mail.py | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/mail_base/controllers/main.py b/mail_base/controllers/main.py index d972502..c00562f 100644 --- a/mail_base/controllers/main.py +++ b/mail_base/controllers/main.py @@ -1,8 +1,8 @@ # Copyright 2017 mikaelh # Copyright 2017-2019 Ivan Yelizariev # License LGPL-3.0 (https://www.gnu.org/licenses/lgpl.html) -from openerp.addons.bus.controllers.main import BusController -from openerp.http import request +from odoo.addons.bus.controllers.main import BusController +from odoo.http import request class MailChatController(BusController): diff --git a/mail_base/models.py b/mail_base/models.py index 3780803..69df66b 100644 --- a/mail_base/models.py +++ b/mail_base/models.py @@ -2,7 +2,7 @@ # Copyright 2017 Ivan Yelizariev # License LGPL-3.0 (https://www.gnu.org/licenses/lgpl.html) -from openerp import api, models +from odoo import api, models class MailMessage(models.Model): diff --git a/mail_check_immediately/models.py b/mail_check_immediately/models.py index ccd6f86..b0ad4d0 100644 --- a/mail_check_immediately/models.py +++ b/mail_check_immediately/models.py @@ -1,7 +1,7 @@ import datetime -from openerp import api, exceptions, fields, models, tools -from openerp.tools.translate import _ +from odoo import api, exceptions, fields, models, tools +from odoo.tools.translate import _ class FetchMailServer(models.Model): diff --git a/mail_fix_553/mail_fix_553.py b/mail_fix_553/mail_fix_553.py index af62d9a..89e1f38 100644 --- a/mail_fix_553/mail_fix_553.py +++ b/mail_fix_553/mail_fix_553.py @@ -3,11 +3,11 @@ import logging import re from email.utils import formataddr -from openerp import SUPERUSER_ID, tools -from openerp.addons.base.ir.ir_mail_server import MailDeliveryException -from openerp.osv import osv -from openerp.tools.safe_eval import safe_eval as eval -from openerp.tools.translate import _ +from odoo import SUPERUSER_ID, tools +from odoo.addons.base.ir.ir_mail_server import MailDeliveryException +from odoo.osv import osv +from odoo.tools.safe_eval import safe_eval as eval +from odoo.tools.translate import _ _logger = logging.getLogger(__name__) diff --git a/mailgun/models/ir_config_parameter.py b/mailgun/models/ir_config_parameter.py index 59ce1e5..84e6a2d 100644 --- a/mailgun/models/ir_config_parameter.py +++ b/mailgun/models/ir_config_parameter.py @@ -2,7 +2,7 @@ import logging import requests import simplejson -from openerp import api, models +from odoo import api, models _logger = logging.getLogger(__name__) diff --git a/res_partner_company_messages/models.py b/res_partner_company_messages/models.py index 704c066..2f26403 100644 --- a/res_partner_company_messages/models.py +++ b/res_partner_company_messages/models.py @@ -1,4 +1,4 @@ -from openerp import api, models +from odoo import api, models class Partner(models.Model): diff --git a/res_partner_mails_count/models.py b/res_partner_mails_count/models.py index fb34fff..e2cdfe4 100644 --- a/res_partner_mails_count/models.py +++ b/res_partner_mails_count/models.py @@ -1,4 +1,4 @@ -from openerp import api, fields, models +from odoo import api, fields, models class ResPartner(models.Model): diff --git a/res_partner_mails_count/tests/test_mail.py b/res_partner_mails_count/tests/test_mail.py index 335c8ad..80fb2ac 100644 --- a/res_partner_mails_count/tests/test_mail.py +++ b/res_partner_mails_count/tests/test_mail.py @@ -1,4 +1,4 @@ -from openerp.tests.common import TransactionCase +from odoo.tests.common import TransactionCase class TestMessageCount(TransactionCase):