From 95d03559a27b0d15afaac9d2cdf8f4e1977ea02c Mon Sep 17 00:00:00 2001 From: Richard Mathot Date: Tue, 3 Oct 2017 10:30:55 +0200 Subject: [PATCH] [FIX][P3] *: mock is now a part of unittest --- addons/account_budget/tests/test_theoreticalamount.py | 5 ++++- addons/event/tests/test_event_flow.py | 5 ++++- .../website_crm_partner_assign/tests/test_partner_assign.py | 5 ++++- addons/website_sale/tests/test_website_sale_pricelist.py | 5 ++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/addons/account_budget/tests/test_theoreticalamount.py b/addons/account_budget/tests/test_theoreticalamount.py index 6b499302fe0..cde8f81a9b6 100644 --- a/addons/account_budget/tests/test_theoreticalamount.py +++ b/addons/account_budget/tests/test_theoreticalamount.py @@ -2,7 +2,10 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. from .common import TestAccountBudgetCommon -from mock import patch +try: + from unittest.mock import patch +except ImportError: + from mock import patch from odoo.fields import Datetime diff --git a/addons/event/tests/test_event_flow.py b/addons/event/tests/test_event_flow.py index f9a7ad47fa4..c780a95eb34 100644 --- a/addons/event/tests/test_event_flow.py +++ b/addons/event/tests/test_event_flow.py @@ -7,7 +7,10 @@ from odoo.addons.event.tests.common import TestEventCommon from odoo.exceptions import ValidationError, UserError, AccessError from odoo.tools import mute_logger from odoo.fields import Datetime -from mock import patch +try: + from unittest.mock import patch +except ImportError: + from mock import patch class TestEventFlow(TestEventCommon): diff --git a/addons/website_crm_partner_assign/tests/test_partner_assign.py b/addons/website_crm_partner_assign/tests/test_partner_assign.py index 9d1689b3286..3b4344e255f 100644 --- a/addons/website_crm_partner_assign/tests/test_partner_assign.py +++ b/addons/website_crm_partner_assign/tests/test_partner_assign.py @@ -1,7 +1,10 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from mock import patch +try: + from unittest.mock import patch +except ImportError: + from mock import patch from odoo.exceptions import AccessError from odoo.tests.common import TransactionCase diff --git a/addons/website_sale/tests/test_website_sale_pricelist.py b/addons/website_sale/tests/test_website_sale_pricelist.py index 21accb52814..754a49432d6 100644 --- a/addons/website_sale/tests/test_website_sale_pricelist.py +++ b/addons/website_sale/tests/test_website_sale_pricelist.py @@ -1,6 +1,9 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from mock import patch +try: + from unittest.mock import patch +except ImportError: + from mock import patch from odoo.tests.common import TransactionCase