Fix some slot signatures that were the incorrect type

nose2.cfg

@@ -1,17 +1,22 @@
 [unittest]
-verbose = True
+verbose = true
+plugins = nose2.plugins.mp
 
 [log-capture]
-always-on = True
+always-on = true
-clear-handlers = True
+clear-handlers = true
 filter = -nose
 log-level = ERROR
 
 [test-result]
-always-on = True
+always-on = true
-descriptions = True
+descriptions = true
 
 [coverage]
-always-on = False
+always-on = true
 coverage = openlp
 coverage-report = html
+
+[multiprocess]
+always-on = false
+processes = 4

openlp/core/lib/projector/constants.py

@@ -131,7 +131,8 @@ S_INFO = 310
 S_NETWORK_SENDING = 400
 S_NETWORK_RECEIVED = 401
 
-CONNECTION_ERRORS = {E_NOT_CONNECTED, E_NO_AUTHENTICATION, E_AUTHENTICATION, E_CLASS,
+CONNECTION_ERRORS = {
+    E_NOT_CONNECTED, E_NO_AUTHENTICATION, E_AUTHENTICATION, E_CLASS,
     E_PREFIX, E_CONNECTION_REFUSED, E_REMOTE_HOST_CLOSED_CONNECTION,
     E_HOST_NOT_FOUND, E_SOCKET_ACCESS, E_SOCKET_RESOURCE, E_SOCKET_TIMEOUT,
     E_DATAGRAM_TOO_LARGE, E_NETWORK, E_ADDRESS_IN_USE, E_SOCKET_ADDRESS_NOT_AVAILABLE,
@@ -139,9 +140,10 @@ CONNECTION_ERRORS = {E_NOT_CONNECTED, E_NO_AUTHENTICATION, E_AUTHENTICATION, E_C
     E_SLS_HANDSHAKE_FAILED, E_UNFINISHED_SOCKET_OPERATION, E_PROXY_CONNECTION_REFUSED,
     E_PROXY_CONNECTION_CLOSED, E_PROXY_CONNECTION_TIMEOUT, E_PROXY_NOT_FOUND,
     E_PROXY_PROTOCOL, E_UNKNOWN_SOCKET_ERROR
-                     }
+}
 
-PJLINK_ERRORS = {'ERRA': E_AUTHENTICATION,   # Authentication error
+PJLINK_ERRORS = {
+    'ERRA': E_AUTHENTICATION,   # Authentication error
     'ERR1': E_UNDEFINED,        # Undefined command error
     'ERR2': E_PARAMETER,        # Invalid parameter error
     'ERR3': E_UNAVAILABLE,      # Projector busy
@@ -150,10 +152,12 @@ PJLINK_ERRORS = {'ERRA': E_AUTHENTICATION,   # Authentication error
     E_UNDEFINED: 'ERR1',
     E_PARAMETER: 'ERR2',
     E_UNAVAILABLE: 'ERR3',
-                 E_PROJECTOR: 'ERR4'}
+    E_PROJECTOR: 'ERR4'
+}
 
 # Map error/status codes to string
-ERROR_STRING = {0: 'S_OK',
+ERROR_STRING = {
+    0: 'S_OK',
     E_GENERAL: 'E_GENERAL',
     E_NOT_CONNECTED: 'E_NOT_CONNECTED',
     E_FAN: 'E_FAN',
@@ -191,9 +195,11 @@ ERROR_STRING = {0: 'S_OK',
     E_PROXY_CONNECTION_TIMEOUT: 'E_PROXY_CONNECTION_TIMEOUT',
     E_PROXY_NOT_FOUND: 'E_PROXY_NOT_FOUND',
     E_PROXY_PROTOCOL: 'E_PROXY_PROTOCOL',
-                E_UNKNOWN_SOCKET_ERROR: 'E_UNKNOWN_SOCKET_ERROR'}
+    E_UNKNOWN_SOCKET_ERROR: 'E_UNKNOWN_SOCKET_ERROR'
+}
 
-STATUS_STRING = {S_NOT_CONNECTED: 'S_NOT_CONNECTED',
+STATUS_STRING = {
+    S_NOT_CONNECTED: 'S_NOT_CONNECTED',
     S_CONNECTING: 'S_CONNECTING',
     S_CONNECTED: 'S_CONNECTED',
     S_STATUS: 'S_STATUS',
@@ -205,10 +211,12 @@ STATUS_STRING = {S_NOT_CONNECTED: 'S_NOT_CONNECTED',
     S_COOLDOWN: 'S_COOLDOWN',
     S_INFO: 'S_INFO',
     S_NETWORK_SENDING: 'S_NETWORK_SENDING',
-                 S_NETWORK_RECEIVED: 'S_NETWORK_RECEIVED'}
+    S_NETWORK_RECEIVED: 'S_NETWORK_RECEIVED'
+}
 
 # Map error/status codes to message strings
-ERROR_MSG = {E_OK: translate('OpenLP.ProjectorConstants', 'OK'),  # E_OK | S_OK
+ERROR_MSG = {
+    E_OK: translate('OpenLP.ProjectorConstants', 'OK'),  # E_OK | S_OK
     E_GENERAL: translate('OpenLP.ProjectorConstants', 'General projector error'),
     E_NOT_CONNECTED: translate('OpenLP.ProjectorConstants', 'Not connected error'),
     E_LAMP: translate('OpenLP.ProjectorConstants', 'Lamp error'),
@@ -286,30 +294,38 @@ ERROR_MSG = {E_OK: translate('OpenLP.ProjectorConstants', 'OK'),  # E_OK | S_OK
     S_COOLDOWN: translate('OpenLP.ProjectorConstants', 'Cooldown in progress'),
     S_INFO: translate('OpenLP.ProjectorConstants', 'Projector Information available'),
     S_NETWORK_SENDING: translate('OpenLP.ProjectorConstants', 'Sending data'),
-             S_NETWORK_RECEIVED: translate('OpenLP.ProjectorConstants', 'Received data')}
+    S_NETWORK_RECEIVED: translate('OpenLP.ProjectorConstants', 'Received data')
+}
 
 # Map for ERST return codes to string
-PJLINK_ERST_STATUS = {'0': ERROR_STRING[E_OK],
+PJLINK_ERST_STATUS = {
+    '0': ERROR_STRING[E_OK],
     '1': ERROR_STRING[E_WARN],
-                      '2': ERROR_STRING[E_ERROR]}
+    '2': ERROR_STRING[E_ERROR]
+}
 
 # Map for POWR return codes to status code
-PJLINK_POWR_STATUS = {'0': S_STANDBY,
+PJLINK_POWR_STATUS = {
+    '0': S_STANDBY,
     '1': S_ON,
     '2': S_COOLDOWN,
     '3': S_WARMUP,
     S_STANDBY: '0',
     S_ON: '1',
     S_COOLDOWN: '2',
-                      S_WARMUP: '3'}
+    S_WARMUP: '3'
+}
 
-PJLINK_DEFAULT_SOURCES = {'1': translate('OpenLP.DB', 'RGB'),
+PJLINK_DEFAULT_SOURCES = {
+    '1': translate('OpenLP.DB', 'RGB'),
     '2': translate('OpenLP.DB', 'Video'),
     '3': translate('OpenLP.DB', 'Digital'),
     '4': translate('OpenLP.DB', 'Storage'),
-                          '5': translate('OpenLP.DB', 'Network')}
+    '5': translate('OpenLP.DB', 'Network')
+}
 
-PJLINK_DEFAULT_CODES = {'11': translate('OpenLP.DB', 'RGB 1'),
+PJLINK_DEFAULT_CODES = {
+    '11': translate('OpenLP.DB', 'RGB 1'),
     '12': translate('OpenLP.DB', 'RGB 2'),
     '13': translate('OpenLP.DB', 'RGB 3'),
     '14': translate('OpenLP.DB', 'RGB 4'),
@@ -354,4 +370,4 @@ PJLINK_DEFAULT_CODES = {'11': translate('OpenLP.DB', 'RGB 1'),
     '57': translate('OpenLP.DB', 'Network 7'),
     '58': translate('OpenLP.DB', 'Network 8'),
     '59': translate('OpenLP.DB', 'Network 9')
-                        }
+}

openlp/core/lib/projector/pjlink1.py

@@ -49,7 +49,12 @@ from codecs import decode
 from PyQt5 import QtCore, QtNetwork
 
 from openlp.core.common import translate, qmd5_hash
-from openlp.core.lib.projector.constants import *
+from openlp.core.lib.projector.constants import CONNECTION_ERRORS, CR, ERROR_MSG, ERROR_STRING, \
+    E_AUTHENTICATION, E_CONNECTION_REFUSED, E_GENERAL, E_INVALID_DATA, E_NETWORK, E_NOT_CONNECTED, \
+    E_PARAMETER, E_PROJECTOR, E_SOCKET_TIMEOUT, E_UNAVAILABLE, E_UNDEFINED, PJLINK_ERRORS, \
+    PJLINK_ERST_STATUS, PJLINK_MAX_PACKET, PJLINK_PORT, PJLINK_POWR_STATUS, PJLINK_VALID_CMD, \
+    STATUS_STRING, S_CONNECTED, S_CONNECTING, S_NETWORK_RECEIVED, S_NETWORK_SENDING, S_NOT_CONNECTED, \
+    S_OFF, S_OK, S_ON, S_STATUS
 
 # Shortcuts
 SocketError = QtNetwork.QAbstractSocket.SocketError

openlp/core/ui/projector/manager.py

@@ -34,9 +34,9 @@ from openlp.core.common import RegistryProperties, Settings, OpenLPMixin, \
 from openlp.core.ui.lib import OpenLPToolbar
 from openlp.core.lib.ui import create_widget_action
 from openlp.core.lib.projector import DialogSourceStyle
-from openlp.core.lib.projector.constants import S_NOT_CONNECTED, S_CONNECTING, S_CONNECTED, S_OFF, S_INITIALIZE, \
+from openlp.core.lib.projector.constants import ERROR_MSG, ERROR_STRING, E_AUTHENTICATION, E_ERROR, \
-    S_STANDBY, S_WARMUP, S_ON, S_COOLDOWN, E_ERROR, E_NETWORK, E_AUTHENTICATION, E_UNKNOWN_SOCKET_ERROR, \
+    E_NETWORK, E_NOT_CONNECTED, E_UNKNOWN_SOCKET_ERROR, STATUS_STRING, S_CONNECTED, S_CONNECTING, S_COOLDOWN, \
-    E_NOT_CONNECTED
+    S_INITIALIZE, S_NOT_CONNECTED, S_OFF, S_ON, S_STANDBY, S_WARMUP
 from openlp.core.lib.projector.db import ProjectorDB
 from openlp.core.lib.projector.pjlink1 import PJLink1
 from openlp.core.ui.projector.editform import ProjectorEditForm

tests/functional/openlp_core_common/test_registryproperties.py

@@ -37,7 +37,7 @@ class TestRegistryProperties(TestCase, RegistryProperties):
         """
         Create the Register
         """
-        Registry.create()
+        self.registry = Registry.create()
 
     def test_no_application(self):
         """
@@ -75,3 +75,23 @@ class TestRegistryProperties(TestCase, RegistryProperties):
 
         # THEN the application should be none
         self.assertEqual(self.application, application, 'The application value should match')
+
+    @patch('openlp.core.common.registryproperties.is_win')
+    def test_get_application_on_windows(self, mocked_is_win):
+        """
+        Set that getting the application object on Windows happens dynamically
+        """
+        # GIVEN an Empty Registry and we're on Windows
+        mocked_is_win.return_value = True
+        mock_application = MagicMock()
+        reg_props = RegistryProperties()
+
+        # WHEN the application is accessed
+        with patch.object(self.registry, 'get') as mocked_get:
+            mocked_get.return_value = mock_application
+            actual_application = reg_props.application
+
+        # THEN the application should be the mock object, and the correct function should have been called
+        self.assertEqual(mock_application, actual_application, 'The application value should match')
+        mocked_is_win.assert_called_with()
+        mocked_get.assert_called_with('application')