From b38921a90b6f19ecf61c225070d3da36284d3ab8 Mon Sep 17 00:00:00 2001 From: Ken Roberts Date: Tue, 21 Oct 2014 14:40:47 -0700 Subject: [PATCH] Code cleanups --- openlp/core/lib/projector/pjlink1.py | 8 ++++---- tests/interfaces/openlp_core_ui/test_projectormanager.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/openlp/core/lib/projector/pjlink1.py b/openlp/core/lib/projector/pjlink1.py index 1915ead20..9449003cd 100644 --- a/openlp/core/lib/projector/pjlink1.py +++ b/openlp/core/lib/projector/pjlink1.py @@ -45,7 +45,7 @@ import logging log = logging.getLogger(__name__) -log.debug('rpjlink1 loaded') +log.debug('pjlink1 loaded') __all__ = ['PJLink1'] @@ -268,11 +268,11 @@ class PJLink1(QTcpSocket): :returns: (Status/Error code, String) """ if status in ERROR_STRING: - return (ERROR_STRING[status], ERROR_MSG[status]) + return ERROR_STRING[status], ERROR_MSG[status] elif status in STATUS_STRING: - return (STATUS_STRING[status], ERROR_MSG[status]) + return STATUS_STRING[status], ERROR_MSG[status] else: - return (status, translate('OpenLP.PJLink1', 'Unknown status')) + return status, translate('OpenLP.PJLink1', 'Unknown status') def change_status(self, status, msg=None): """ diff --git a/tests/interfaces/openlp_core_ui/test_projectormanager.py b/tests/interfaces/openlp_core_ui/test_projectormanager.py index 6ead7c336..4dd79ec7a 100644 --- a/tests/interfaces/openlp_core_ui/test_projectormanager.py +++ b/tests/interfaces/openlp_core_ui/test_projectormanager.py @@ -70,7 +70,7 @@ class TestProjectorManager(TestCase, TestMixin): Delete all the C++ objects at the end so that we don't have a segfault. """ self.projectordb.session.close() - del(self.projector_manager) + del self.projector_manager self.destroy_settings() def bootstrap_initialise_test(self):