From 09a084be185883e53edbba299fe150ff76bda088 Mon Sep 17 00:00:00 2001 From: suutari-olli Date: Sat, 30 Apr 2016 03:07:36 +0300 Subject: [PATCH] - Removed un-needed import that was added earlier - Pep8 fixes --- openlp/core/common/uistrings.py | 2 +- tests/functional/openlp_plugins/bibles/test_mediaitem.py | 3 +-- tests/functional/openlp_plugins/songs/test_openlpimporter.py | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/openlp/core/common/uistrings.py b/openlp/core/common/uistrings.py index 307daf170..ed8364cee 100644 --- a/openlp/core/common/uistrings.py +++ b/openlp/core/common/uistrings.py @@ -153,7 +153,7 @@ class UiStrings(object): self.Version = translate('OpenLP.Ui', 'Version') self.View = translate('OpenLP.Ui', 'View') self.ViewMode = translate('OpenLP.Ui', 'View Mode') - # Translations used in both, bibles\lib\mediaitem.py and bibles\lib\manager.py + # Translations that are used in bibles\lib\mediaitem.py and bibles\lib\manager.py self.BibleShortSearchTitle = translate('OpenLP.Ui', 'Search is Empty or too Short') self.BibleShortSearch = translate('OpenLP.Ui', 'The search you have entered is empty or shorter ' 'than 3 characters long.
Please try again with ' diff --git a/tests/functional/openlp_plugins/bibles/test_mediaitem.py b/tests/functional/openlp_plugins/bibles/test_mediaitem.py index 5b78c2d74..8c3b6d24f 100644 --- a/tests/functional/openlp_plugins/bibles/test_mediaitem.py +++ b/tests/functional/openlp_plugins/bibles/test_mediaitem.py @@ -24,8 +24,7 @@ This module contains tests for the lib submodule of the Presentations plugin. """ from unittest import TestCase - -from openlp.core.common import Registry, Settings +from openlp.core.common import Registry from openlp.plugins.bibles.lib.mediaitem import BibleMediaItem from tests.functional import MagicMock, patch from tests.helpers.testmixin import TestMixin diff --git a/tests/functional/openlp_plugins/songs/test_openlpimporter.py b/tests/functional/openlp_plugins/songs/test_openlpimporter.py index 113db16e0..b78d5c43b 100644 --- a/tests/functional/openlp_plugins/songs/test_openlpimporter.py +++ b/tests/functional/openlp_plugins/songs/test_openlpimporter.py @@ -73,4 +73,3 @@ class TestOpenLPImport(TestCase): self.assertIsNone(importer.do_import(), 'do_import should return None when import_source is not a list') self.assertEqual(mocked_import_wizard.progress_bar.setMaximum.called, False, 'setMaximum on import_wizard.progress_bar should not have been called') -