From 734adbbd5a9f462d0f3d7edda2efe59899a6faed Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Wed, 19 Mar 2014 19:33:03 +0100 Subject: [PATCH] Fix import of MagicMock --- .../openlp_plugins/presentations/test_impresscontroller.py | 2 +- .../openlp_plugins/presentations/test_powerpointcontroller.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/functional/openlp_plugins/presentations/test_impresscontroller.py b/tests/functional/openlp_plugins/presentations/test_impresscontroller.py index e86bcf6aa..88215bb59 100644 --- a/tests/functional/openlp_plugins/presentations/test_impresscontroller.py +++ b/tests/functional/openlp_plugins/presentations/test_impresscontroller.py @@ -31,7 +31,7 @@ Functional tests to test the Impress class and related methods. """ from unittest import TestCase import os -from mock import MagicMock +from tests.functional import patch, MagicMock from openlp.plugins.presentations.lib.impresscontroller import \ ImpressController, ImpressDocument, TextType diff --git a/tests/functional/openlp_plugins/presentations/test_powerpointcontroller.py b/tests/functional/openlp_plugins/presentations/test_powerpointcontroller.py index 71b076cba..2ecdd65d7 100644 --- a/tests/functional/openlp_plugins/presentations/test_powerpointcontroller.py +++ b/tests/functional/openlp_plugins/presentations/test_powerpointcontroller.py @@ -31,7 +31,7 @@ Functional tests to test the PowerPointController class and related methods. """ from unittest import TestCase import os -from mock import MagicMock +from tests.functional import patch, MagicMock from openlp.plugins.presentations.lib.powerpointcontroller import \ PowerpointController, PowerpointDocument, _get_text_from_shapes