From 4d68382d5223bd0ee45d51fc8fe2db3a52e3aa2f Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Mon, 9 Oct 2017 19:40:41 -0700 Subject: [PATCH] Fix some issues from the mergefest bzr-revno: 2779 --- openlp/plugins/songs/lib/upgrade.py | 2 +- tests/functional/openlp_core_ui/test_style.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/openlp/plugins/songs/lib/upgrade.py b/openlp/plugins/songs/lib/upgrade.py index bc7c95624..eca18876b 100644 --- a/openlp/plugins/songs/lib/upgrade.py +++ b/openlp/plugins/songs/lib/upgrade.py @@ -29,7 +29,7 @@ import logging from sqlalchemy import Table, Column, ForeignKey, types from sqlalchemy.sql.expression import func, false, null, text -from openlp.core.common import AppLocation +from openlp.core.common.applocation import AppLocation from openlp.core.common.db import drop_columns from openlp.core.common.json import OpenLPJsonEncoder from openlp.core.common.path import Path diff --git a/tests/functional/openlp_core_ui/test_style.py b/tests/functional/openlp_core_ui/test_style.py index 6124a260c..fc017e87d 100644 --- a/tests/functional/openlp_core_ui/test_style.py +++ b/tests/functional/openlp_core_ui/test_style.py @@ -33,7 +33,7 @@ from openlp.core.ui.style import MEDIA_MANAGER_STYLE, WIN_REPAIR_STYLESHEET, get @skipIf(not hasattr(openlp.core.ui.style, 'qdarkstyle'), 'qdarkstyle is not installed') @patch('openlp.core.ui.style.HAS_DARK_STYLE', True) @patch('openlp.core.ui.style.Settings') -@patch('object(openlp.core.ui.style.qdarkstyle') +@patch('openlp.core.ui.style.qdarkstyle') def test_get_application_stylesheet_dark(mocked_qdarkstyle, MockSettings): """Test that the dark stylesheet is returned when available and enabled""" # GIVEN: We're on Windows and no dark style is set