From c9ff88ebfc4a88a29d1a8d0f1b7a5643d1e21699 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Fri, 12 Aug 2016 12:24:54 +0200 Subject: [PATCH] Removed a log line I never wrote and move a variable for a test I need it in --- openlp/core/ui/projector/sourceselectform.py | 6 ++---- .../openlp_core_common/test_registryproperties.py | 5 +++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/openlp/core/ui/projector/sourceselectform.py b/openlp/core/ui/projector/sourceselectform.py index 8aa2ce3fa..c2b1c2a1b 100644 --- a/openlp/core/ui/projector/sourceselectform.py +++ b/openlp/core/ui/projector/sourceselectform.py @@ -20,9 +20,9 @@ # Temple Place, Suite 330, Boston, MA 02111-1307 USA # ############################################################################### """ - :mod: `openlp.core.ui.projector.sourceselectform` module +:mod: `openlp.core.ui.projector.sourceselectform` module - Provides the dialog window for selecting video source for projector. +Provides the dialog window for selecting video source for projector. """ import logging @@ -34,7 +34,6 @@ from openlp.core.lib.projector.db import ProjectorSource from openlp.core.lib.projector.constants import PJLINK_DEFAULT_SOURCES, PJLINK_DEFAULT_CODES log = logging.getLogger(__name__) -log.debug('editform loaded') def source_group(inputs, source_text): @@ -270,7 +269,6 @@ class SourceSelectTabs(QtWidgets.QDialog): self.projector = projector self.source_text = self.projectordb.get_source_list(projector=projector) self.source_group = source_group(projector.source_available, self.source_text) - # self.source_group = {'4': {'41': 'Storage 1'}, '5': {"51": 'Network 1'}} self.button_group = [] if self.edit else QtWidgets.QButtonGroup() keys = list(self.source_group.keys()) keys.sort() diff --git a/tests/functional/openlp_core_common/test_registryproperties.py b/tests/functional/openlp_core_common/test_registryproperties.py index 30f69cce0..38ae6471b 100644 --- a/tests/functional/openlp_core_common/test_registryproperties.py +++ b/tests/functional/openlp_core_common/test_registryproperties.py @@ -37,7 +37,7 @@ class TestRegistryProperties(TestCase, RegistryProperties): """ Create the Register """ - self.registry = Registry.create() + Registry.create() def test_no_application(self): """ @@ -85,9 +85,10 @@ class TestRegistryProperties(TestCase, RegistryProperties): mocked_is_win.return_value = True mock_application = MagicMock() reg_props = RegistryProperties() + registry = Registry() # WHEN the application is accessed - with patch.object(self.registry, 'get') as mocked_get: + with patch.object(registry, 'get') as mocked_get: mocked_get.return_value = mock_application actual_application = reg_props.application