From 3e8af699c3c3956ecf38f1fa753a3fb51836f106 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Mon, 4 Apr 2016 22:19:37 +0100 Subject: [PATCH] fix import issues --- openlp/plugins/presentations/lib/pdfcontroller.py | 2 +- openlp/plugins/presentations/lib/pptviewcontroller.py | 2 +- tests/functional/openlp_plugins/remotes/test_remotetab.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/openlp/plugins/presentations/lib/pdfcontroller.py b/openlp/plugins/presentations/lib/pdfcontroller.py index 64e197eba..dbea84327 100644 --- a/openlp/plugins/presentations/lib/pdfcontroller.py +++ b/openlp/plugins/presentations/lib/pdfcontroller.py @@ -27,7 +27,7 @@ import re from shutil import which from subprocess import check_output, CalledProcessError, STDOUT -from openlp.core.utils import AppLocation +from openlp.core.common import AppLocation from openlp.core.common import Settings, is_win, trace_error_handler from openlp.core.lib import ScreenList from .presentationcontroller import PresentationController, PresentationDocument diff --git a/openlp/plugins/presentations/lib/pptviewcontroller.py b/openlp/plugins/presentations/lib/pptviewcontroller.py index aba0aa88e..5989e775a 100644 --- a/openlp/plugins/presentations/lib/pptviewcontroller.py +++ b/openlp/plugins/presentations/lib/pptviewcontroller.py @@ -34,7 +34,7 @@ if is_win(): from ctypes import cdll from ctypes.wintypes import RECT -from openlp.core.utils import AppLocation +from openlp.core.common import AppLocation from openlp.core.lib import ScreenList from .presentationcontroller import PresentationController, PresentationDocument diff --git a/tests/functional/openlp_plugins/remotes/test_remotetab.py b/tests/functional/openlp_plugins/remotes/test_remotetab.py index d541dc6e3..24375740f 100644 --- a/tests/functional/openlp_plugins/remotes/test_remotetab.py +++ b/tests/functional/openlp_plugins/remotes/test_remotetab.py @@ -99,7 +99,7 @@ class TestRemoteTab(TestCase, TestMixin): """ # GIVEN: A mocked location with patch('openlp.core.common.Settings') as mocked_class, \ - patch('openlp.core.utils.AppLocation.get_directory') as mocked_get_directory, \ + patch('openlp.core.common.applocation.AppLocation.get_directory') as mocked_get_directory, \ patch('openlp.core.common.check_directory_exists') as mocked_check_directory_exists, \ patch('openlp.core.common.applocation.os') as mocked_os: # GIVEN: A mocked out Settings class and a mocked out AppLocation.get_directory() @@ -127,7 +127,7 @@ class TestRemoteTab(TestCase, TestMixin): """ # GIVEN: A mocked location with patch('openlp.core.common.Settings') as mocked_class, \ - patch('openlp.core.utils.AppLocation.get_directory') as mocked_get_directory, \ + patch('openlp.core.common.applocation.AppLocation.get_directory') as mocked_get_directory, \ patch('openlp.core.common.check_directory_exists') as mocked_check_directory_exists, \ patch('openlp.core.common.applocation.os') as mocked_os: # GIVEN: A mocked out Settings class and a mocked out AppLocation.get_directory()