raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

fix import issues

Browse Source
This commit is contained in:
Tim Bentley 2016-04-04 22:19:37 +01:00
parent d440891819
commit 3e8af699c3
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/plugins/presentations/lib/pdfcontroller.py
View File

@ -27,7 +27,7 @@ import re
from shutil import which from shutil import which
from subprocess import check_output, CalledProcessError, STDOUT 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.common import Settings, is_win, trace_error_handler
from openlp.core.lib import ScreenList from openlp.core.lib import ScreenList
from .presentationcontroller import PresentationController, PresentationDocument from .presentationcontroller import PresentationController, PresentationDocument

2
openlp/plugins/presentations/lib/pptviewcontroller.py
View File

@ -34,7 +34,7 @@ if is_win():
from ctypes import cdll from ctypes import cdll
from ctypes.wintypes import RECT from ctypes.wintypes import RECT
from openlp.core.utils import AppLocation from openlp.core.common import AppLocation
from openlp.core.lib import ScreenList from openlp.core.lib import ScreenList
from .presentationcontroller import PresentationController, PresentationDocument from .presentationcontroller import PresentationController, PresentationDocument

4
tests/functional/openlp_plugins/remotes/test_remotetab.py
View File

@ -99,7 +99,7 @@ class TestRemoteTab(TestCase, TestMixin):
""" """
# GIVEN: A mocked location # GIVEN: A mocked location
with patch('openlp.core.common.Settings') as mocked_class, \ 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.check_directory_exists') as mocked_check_directory_exists, \
patch('openlp.core.common.applocation.os') as mocked_os: patch('openlp.core.common.applocation.os') as mocked_os:
# GIVEN: A mocked out Settings class and a mocked out AppLocation.get_directory() # 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 # GIVEN: A mocked location
with patch('openlp.core.common.Settings') as mocked_class, \ 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.check_directory_exists') as mocked_check_directory_exists, \
patch('openlp.core.common.applocation.os') as mocked_os: patch('openlp.core.common.applocation.os') as mocked_os:
# GIVEN: A mocked out Settings class and a mocked out AppLocation.get_directory() # GIVEN: A mocked out Settings class and a mocked out AppLocation.get_directory()