From 95a056e504f8ad80e89eb3ebba4602ace5f22edf Mon Sep 17 00:00:00 2001 From: Bastian Germann Date: Wed, 18 Sep 2019 23:35:47 +0200 Subject: [PATCH] Remove some pylint occurences --- .gitignore | 1 - openlp/core/api/http/wsgiapp.py | 1 - openlp/core/ui/slidecontroller.py | 2 +- tests/functional/openlp_plugins/songs/test_songselect.py | 3 +-- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 505bd0a07..3a44e32ba 100644 --- a/.gitignore +++ b/.gitignore @@ -18,7 +18,6 @@ .idea .kdev4 .komodotools -.pylint.d .pytest_cache .vscode OpenLP.egg-info diff --git a/openlp/core/api/http/wsgiapp.py b/openlp/core/api/http/wsgiapp.py index 0af71e715..dae6947c0 100644 --- a/openlp/core/api/http/wsgiapp.py +++ b/openlp/core/api/http/wsgiapp.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- # vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4 -# pylint: disable=logging-format-interpolation ########################################################################## # OpenLP - Open Source Lyrics Projection # diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index b4c36815e..7841e83f8 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -1152,7 +1152,7 @@ class SlideController(QtWidgets.QWidget, LogMixin, RegistryProperties): # done by the thread holding the lock. If it is a "start" slide, we must wait for the lock, but only for 0.2 # seconds, since we don't want to cause a deadlock timeout = 0.2 if start else -1 - if not self.slide_selected_lock.acquire(start, timeout): # pylint: disable=too-many-function-args + if not self.slide_selected_lock.acquire(start, timeout): if start: self.log_debug('Could not get lock in slide_selected after waiting %f, skip to avoid deadlock.' % timeout) diff --git a/tests/functional/openlp_plugins/songs/test_songselect.py b/tests/functional/openlp_plugins/songs/test_songselect.py index 4f2fb1dac..405c25865 100644 --- a/tests/functional/openlp_plugins/songs/test_songselect.py +++ b/tests/functional/openlp_plugins/songs/test_songselect.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- # vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4 -# pylint: disable=protected-access ########################################################################## # OpenLP - Open Source Lyrics Projection # @@ -895,7 +894,7 @@ class TestSearchWorker(TestCase, TestMixin): # WHEN: The start() method is called with patch.object(worker, 'found_song') as mocked_found_song: - worker._found_song_callback(song) # pylint: disable=protected-access + worker._found_song_callback(song) # THEN: The "found_song" signal should have been emitted mocked_found_song.emit.assert_called_with(song)