raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

pylint fixes - minor cleanups

Browse Source
This commit is contained in:
Ken Roberts 2017-05-30 16:26:37 -07:00
parent 3ea37800b7
commit 80369c8b0b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openlp/core/lib/projector/pjlink1.py
View File

@ -129,7 +129,7 @@ class PJLink(QtNetwork.QTcpSocket):
self.ip = ip self.ip = ip
self.port = port self.port = port
self.pin = pin self.pin = pin
super(PJLink, self).__init__() super().__init__()
self.dbid = None self.dbid = None
self.location = None self.location = None
self.notes = 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)) log.warning('({ip}) get_data(): Invalid packet - unknown command "{data}"'.format(ip=self.ip, data=cmd))
self.receive_data_signal() self.receive_data_signal()
return 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 ' log.warn('({ip}) get_data(): Projector returned class reply higher '
'than projector stated class'.format(ip=self.ip)) 'than projector stated class'.format(ip=self.ip))
return self.process_command(cmd, data) return self.process_command(cmd, data)

4
openlp/core/lib/projector/upgrade.py
View File

@ -21,7 +21,7 @@
############################################################################### ###############################################################################
""" """
The :mod:`upgrade` module provides a way for the database and schema that is the 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 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_filter', types.String(30), server_default=null()))
new_op.add_column('projector', Column('model_lamp', types.String(30), server_default=null())) new_op.add_column('projector', Column('model_lamp', types.String(30), server_default=null()))
else: else:
log_warn("Skipping upgrade_2 of projector DB") log.warn("Skipping upgrade_2 of projector DB")