diff --git a/openlp/core/lib/projector/pjlink1.py b/openlp/core/lib/projector/pjlink1.py index 0a3ab8cd4..dfc261f0a 100644 --- a/openlp/core/lib/projector/pjlink1.py +++ b/openlp/core/lib/projector/pjlink1.py @@ -129,7 +129,7 @@ class PJLink(QtNetwork.QTcpSocket): self.ip = ip self.port = port self.pin = pin - super(PJLink, self).__init__() + super().__init__() self.dbid = None self.location = None self.notes = None @@ -467,7 +467,7 @@ class PJLink(QtNetwork.QTcpSocket): log.warning('({ip}) get_data(): Invalid packet - unknown command "{data}"'.format(ip=self.ip, data=cmd)) self.receive_data_signal() return - if int(self.pjlink_class) < int(class_): + if int(self.pjlink_class) < int(version): log.warn('({ip}) get_data(): Projector returned class reply higher ' 'than projector stated class'.format(ip=self.ip)) return self.process_command(cmd, data) diff --git a/openlp/core/lib/projector/upgrade.py b/openlp/core/lib/projector/upgrade.py index 2fc18ccaa..e4a3849a6 100644 --- a/openlp/core/lib/projector/upgrade.py +++ b/openlp/core/lib/projector/upgrade.py @@ -21,7 +21,7 @@ ############################################################################### """ The :mod:`upgrade` module provides a way for the database and schema that is the -backend for the Songs plugin +backend for the projector setup. """ import logging @@ -70,4 +70,4 @@ def upgrade_2(session, metadata): new_op.add_column('projector', Column('model_filter', types.String(30), server_default=null())) new_op.add_column('projector', Column('model_lamp', types.String(30), server_default=null())) else: - log_warn("Skipping upgrade_2 of projector DB") + log.warn("Skipping upgrade_2 of projector DB")