From 404fb002355427b3fb0e3a17e6db86d27688a309 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Thu, 8 Aug 2013 21:12:42 +0200 Subject: [PATCH] Remove pylint remnants --- docs/devtools.rst | 4 ++-- mopidy/__init__.py | 2 -- mopidy/audio/mixers/auto.py | 2 -- mopidy/backends/spotify/session_manager.py | 6 ------ mopidy/core/playback.py | 6 ------ mopidy/frontends/mpd/protocol/__init__.py | 2 -- mopidy/utils/path.py | 2 -- mopidy/utils/versioning.py | 2 -- pylintrc | 21 --------------------- requirements/tests.txt | 1 - 10 files changed, 2 insertions(+), 46 deletions(-) delete mode 100644 pylintrc diff --git a/docs/devtools.rst b/docs/devtools.rst index bc066cd0..6b8e6e30 100644 --- a/docs/devtools.rst +++ b/docs/devtools.rst @@ -22,8 +22,8 @@ tested by Jenkins before it is merged into the ``develop`` branch, which is a bit late, but good enough to get broad testing before new code is released. In addition to running tests, the Jenkins CI server also gathers coverage -statistics and uses pylint to check for errors and possible improvements in our -code. So, if you're out of work, the code coverage and pylint data at the CI +statistics and uses flake8 to check for errors and possible improvements in our +code. So, if you're out of work, the code coverage and flake8 data at the CI server should give you a place to start. diff --git a/mopidy/__init__.py b/mopidy/__init__.py index 17cab15b..6a7699e5 100644 --- a/mopidy/__init__.py +++ b/mopidy/__init__.py @@ -1,8 +1,6 @@ from __future__ import unicode_literals -# pylint: disable = E0611,F0401 from distutils.version import StrictVersion as SV -# pylint: enable = E0611,F0401 import sys import warnings diff --git a/mopidy/audio/mixers/auto.py b/mopidy/audio/mixers/auto.py index 587994cb..6e240ebe 100644 --- a/mopidy/audio/mixers/auto.py +++ b/mopidy/audio/mixers/auto.py @@ -29,9 +29,7 @@ class AutoAudioMixer(gst.Bin): gst.Bin.__init__(self) mixer = self._find_mixer() if mixer: - # pylint: disable=E1101 self.add(mixer) - # pylint: enable=E1101 logger.debug('AutoAudioMixer chose: %s', mixer.get_name()) else: logger.debug('AutoAudioMixer did not find any usable mixers') diff --git a/mopidy/backends/spotify/session_manager.py b/mopidy/backends/spotify/session_manager.py index 125b6ada..3ab4498b 100644 --- a/mopidy/backends/spotify/session_manager.py +++ b/mopidy/backends/spotify/session_manager.py @@ -18,9 +18,6 @@ logger = logging.getLogger('mopidy.backends.spotify') BITRATES = {96: 2, 160: 0, 320: 1} -# pylint: disable = R0901 -# SpotifySessionManager: Too many ancestors (9/7) - class SpotifySessionManager(process.BaseThread, PyspotifySessionManager): cache_location = None @@ -116,9 +113,6 @@ class SpotifySessionManager(process.BaseThread, PyspotifySessionManager): def music_delivery(self, session, frames, frame_size, num_frames, sample_type, sample_rate, channels): """Callback used by pyspotify""" - # pylint: disable = R0913 - # Too many arguments (8/5) - if not self.push_audio_data: return 0 diff --git a/mopidy/core/playback.py b/mopidy/core/playback.py index 2f296751..ea849dbf 100644 --- a/mopidy/core/playback.py +++ b/mopidy/core/playback.py @@ -13,9 +13,6 @@ logger = logging.getLogger('mopidy.core') class PlaybackController(object): - # pylint: disable = R0902 - # Too many instance attributes - pykka_traversable = True def __init__(self, audio, backends, core): @@ -175,9 +172,6 @@ class PlaybackController(object): """ def get_tl_track_at_eot(self): - # pylint: disable = R0911 - # Too many return statements - tl_tracks = self.core.tracklist.tl_tracks if not tl_tracks: diff --git a/mopidy/frontends/mpd/protocol/__init__.py b/mopidy/frontends/mpd/protocol/__init__.py index 1827624b..0eadea7d 100644 --- a/mopidy/frontends/mpd/protocol/__init__.py +++ b/mopidy/frontends/mpd/protocol/__init__.py @@ -72,9 +72,7 @@ def load_protocol_modules(): The protocol modules must be imported to get them registered in :attr:`request_handlers` and :attr:`mpd_commands`. """ - # pylint: disable = W0612 from . import ( # noqa audio_output, channels, command_list, connection, current_playlist, empty, music_db, playback, reflection, status, stickers, stored_playlists) - # pylint: enable = W0612 diff --git a/mopidy/utils/path.py b/mopidy/utils/path.py index 602b2569..c5aa6e45 100644 --- a/mopidy/utils/path.py +++ b/mopidy/utils/path.py @@ -2,9 +2,7 @@ from __future__ import unicode_literals import logging import os -# pylint: disable = W0402 import string -# pylint: enable = W0402 import urllib import urlparse diff --git a/mopidy/utils/versioning.py b/mopidy/utils/versioning.py index 3ad72458..e8856473 100644 --- a/mopidy/utils/versioning.py +++ b/mopidy/utils/versioning.py @@ -14,11 +14,9 @@ def get_version(): def get_git_version(): process = Popen(['git', 'describe'], stdout=PIPE, stderr=PIPE) - # pylint: disable = E1101 if process.wait() != 0: raise EnvironmentError('Execution of "git describe" failed') version = process.stdout.read().strip() - # pylint: enable = E1101 if version.startswith('v'): version = version[1:] return version diff --git a/pylintrc b/pylintrc deleted file mode 100644 index 41e1ab5d..00000000 --- a/pylintrc +++ /dev/null @@ -1,21 +0,0 @@ -[MESSAGES CONTROL] -# -# Disabled messages -# ----------------- -# -# C0103 - Invalid name "%s" (should match %s) -# C0111 - Missing docstring -# R0201 - Method could be a function -# R0801 - Similar lines in %s files -# R0902 - Too many instance attributes (%s/%s) -# R0903 - Too few public methods (%s/%s) -# R0904 - Too many public methods (%s/%s) -# R0912 - Too many branches (%s/%s) -# R0913 - Too many arguments (%s/%s) -# R0921 - Abstract class not referenced -# W0141 - Used builtin function '%s' -# W0142 - Used * or ** magic -# W0511 - TODO, FIXME and XXX in the code -# W0613 - Unused argument %r -# -disable = C0103,C0111,R0201,R0801,R0902,R0903,R0904,R0912,R0913,R0921,W0141,W0142,W0511,W0613 diff --git a/requirements/tests.txt b/requirements/tests.txt index c093682b..8aacebbc 100644 --- a/requirements/tests.txt +++ b/requirements/tests.txt @@ -2,4 +2,3 @@ coverage flake8 mock >= 1.0 nose -pylint