From 5583ca5abab69d3857096f24f29550aa5e76547b Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Sat, 29 Mar 2014 20:47:42 +0100 Subject: [PATCH] New flake8 version with new checks to conform to --- mopidy/config/__init__.py | 2 +- mopidy/core/playback.py | 4 ++-- mopidy/core/tracklist.py | 4 ++-- mopidy/mpd/dispatcher.py | 12 ++++++------ mopidy/mpd/protocol/audio_output.py | 2 +- mopidy/mpd/protocol/current_playlist.py | 10 +++++----- mopidy/mpd/protocol/music_db.py | 2 +- mopidy/mpd/protocol/playback.py | 4 ++-- mopidy/utils/jsonrpc.py | 6 +++--- tests/audio/test_actor.py | 4 ++-- tests/audio/test_playlists.py | 2 +- tests/mpd/protocol/test_music_db.py | 14 +++++++------- tests/mpd/test_commands.py | 2 +- tests/mpd/test_tokenizer.py | 2 +- tests/mpd/test_translator.py | 3 ++- 15 files changed, 37 insertions(+), 36 deletions(-) diff --git a/mopidy/config/__init__.py b/mopidy/config/__init__.py index 2b740549..1f9f5e2d 100644 --- a/mopidy/config/__init__.py +++ b/mopidy/config/__init__.py @@ -38,7 +38,7 @@ _proxy_schema['username'] = String(optional=True) _proxy_schema['password'] = Secret(optional=True) # NOTE: if multiple outputs ever comes something like LogLevelConfigSchema -#_outputs_schema = config.AudioOutputConfigSchema() +# _outputs_schema = config.AudioOutputConfigSchema() _schemas = [_logging_schema, _loglevels_schema, _audio_schema, _proxy_schema] diff --git a/mopidy/core/playback.py b/mopidy/core/playback.py index 3164e3b3..7d57b58c 100644 --- a/mopidy/core/playback.py +++ b/mopidy/core/playback.py @@ -30,7 +30,7 @@ class PlaybackController(object): uri_scheme = urlparse.urlparse(uri).scheme return self.backends.with_playback.get(uri_scheme, None) - ### Properties + # Properties def get_current_tl_track(self): return self.current_tl_track @@ -127,7 +127,7 @@ class PlaybackController(object): mute = property(get_mute, set_mute) """Mute state as a :class:`True` if muted, :class:`False` otherwise""" - ### Methods + # Methods def change_track(self, tl_track, on_error_step=1): """ diff --git a/mopidy/core/tracklist.py b/mopidy/core/tracklist.py index 816e7b65..9c9cdc3d 100644 --- a/mopidy/core/tracklist.py +++ b/mopidy/core/tracklist.py @@ -23,7 +23,7 @@ class TracklistController(object): self._shuffled = [] - ### Properties + # Properties def get_tl_tracks(self): return self._tl_tracks[:] @@ -136,7 +136,7 @@ class TracklistController(object): Playback continues after current song. """ - ### Methods + # Methods def index(self, tl_track): """ diff --git a/mopidy/mpd/dispatcher.py b/mopidy/mpd/dispatcher.py index db01ac83..c2a4cb46 100644 --- a/mopidy/mpd/dispatcher.py +++ b/mopidy/mpd/dispatcher.py @@ -68,7 +68,7 @@ class MpdDispatcher(object): else: return response - ### Filter: catch MPD ACK errors + # Filter: catch MPD ACK errors def _catch_mpd_ack_errors_filter(self, request, response, filter_chain): try: @@ -78,7 +78,7 @@ class MpdDispatcher(object): mpd_ack_error.index = self.command_list_index return [mpd_ack_error.get_mpd_ack()] - ### Filter: authenticate + # Filter: authenticate def _authenticate_filter(self, request, response, filter_chain): if self.authenticated: @@ -94,7 +94,7 @@ class MpdDispatcher(object): else: raise exceptions.MpdPermissionError(command=command_name) - ### Filter: command list + # Filter: command list def _command_list_filter(self, request, response, filter_chain): if self._is_receiving_command_list(request): @@ -117,7 +117,7 @@ class MpdDispatcher(object): self.command_list_index is not None and request != 'command_list_end') - ### Filter: idle + # Filter: idle def _idle_filter(self, request, response, filter_chain): if self._is_currently_idle() and not self._noidle.match(request): @@ -140,7 +140,7 @@ class MpdDispatcher(object): def _is_currently_idle(self): return bool(self.context.subscriptions) - ### Filter: add OK + # Filter: add OK def _add_ok_filter(self, request, response, filter_chain): response = self._call_next_filter(request, response, filter_chain) @@ -151,7 +151,7 @@ class MpdDispatcher(object): def _has_error(self, response): return response and response[-1].startswith('ACK') - ### Filter: call handler + # Filter: call handler def _call_handler_filter(self, request, response, filter_chain): try: diff --git a/mopidy/mpd/protocol/audio_output.py b/mopidy/mpd/protocol/audio_output.py index 868edc49..2c7aea16 100644 --- a/mopidy/mpd/protocol/audio_output.py +++ b/mopidy/mpd/protocol/audio_output.py @@ -34,7 +34,7 @@ def enableoutput(context, outputid): # TODO: implement and test -#@protocol.commands.add('toggleoutput', outputid=protocol.UINT) +# @protocol.commands.add('toggleoutput', outputid=protocol.UINT) def toggleoutput(context, outputid): """ *musicpd.org, audio output section:* diff --git a/mopidy/mpd/protocol/current_playlist.py b/mopidy/mpd/protocol/current_playlist.py index c2e54490..a2d60e96 100644 --- a/mopidy/mpd/protocol/current_playlist.py +++ b/mopidy/mpd/protocol/current_playlist.py @@ -360,8 +360,8 @@ def swapid(context, tlid1, tlid2): # TODO: add at least reflection tests before adding NotImplemented version -#@protocol.commands.add( -# 'prio', priority=protocol.UINT, position=protocol.RANGE) +# @protocol.commands.add( +# 'prio', priority=protocol.UINT, position=protocol.RANGE) def prio(context, priority, position): """ *musicpd.org, current playlist section:* @@ -378,7 +378,7 @@ def prio(context, priority, position): # TODO: add at least reflection tests before adding NotImplemented version -#@protocol.commands.add('prioid') +# @protocol.commands.add('prioid') def prioid(context, *args): """ *musicpd.org, current playlist section:* @@ -391,7 +391,7 @@ def prioid(context, *args): # TODO: add at least reflection tests before adding NotImplemented version -#@protocol.commands.add('addtagid', tlid=protocol.UINT) +# @protocol.commands.add('addtagid', tlid=protocol.UINT) def addtagid(context, tlid, tag, value): """ *musicpd.org, current playlist section:* @@ -407,7 +407,7 @@ def addtagid(context, tlid, tag, value): # TODO: add at least reflection tests before adding NotImplemented version -#@protocol.commands.add('cleartagid', tlid=protocol.UINT) +# @protocol.commands.add('cleartagid', tlid=protocol.UINT) def cleartagid(context, tlid, tag): """ *musicpd.org, current playlist section:* diff --git a/mopidy/mpd/protocol/music_db.py b/mopidy/mpd/protocol/music_db.py index 3da9c5aa..300f95e8 100644 --- a/mopidy/mpd/protocol/music_db.py +++ b/mopidy/mpd/protocol/music_db.py @@ -550,7 +550,7 @@ def update(context, uri=None): # TODO: add at least reflection tests before adding NotImplemented version -#@protocol.commands.add('readcomments') +# @protocol.commands.add('readcomments') def readcomments(context, uri): """ *musicpd.org, music database section:* diff --git a/mopidy/mpd/protocol/playback.py b/mopidy/mpd/protocol/playback.py index a3de1891..5b63c561 100644 --- a/mopidy/mpd/protocol/playback.py +++ b/mopidy/mpd/protocol/playback.py @@ -33,7 +33,7 @@ def crossfade(context, seconds): # TODO: add at least reflection tests before adding NotImplemented version -#@protocol.commands.add('mixrampdb') +# @protocol.commands.add('mixrampdb') def mixrampdb(context, decibels): """ *musicpd.org, playback section:* @@ -50,7 +50,7 @@ def mixrampdb(context, decibels): # TODO: add at least reflection tests before adding NotImplemented version -#@protocol.commands.add('mixrampdelay', seconds=protocol.UINT) +# @protocol.commands.add('mixrampdelay', seconds=protocol.UINT) def mixrampdelay(context, seconds): """ *musicpd.org, playback section:* diff --git a/mopidy/utils/jsonrpc.py b/mopidy/utils/jsonrpc.py index 503921dc..85565262 100644 --- a/mopidy/utils/jsonrpc.py +++ b/mopidy/utils/jsonrpc.py @@ -155,13 +155,13 @@ class JsonRpcWrapper(object): if not isinstance(request, dict): raise JsonRpcInvalidRequestError( data='Request must be an object') - if not 'jsonrpc' in request: + if 'jsonrpc' not in request: raise JsonRpcInvalidRequestError( data='"jsonrpc" member must be included') if request['jsonrpc'] != '2.0': raise JsonRpcInvalidRequestError( data='"jsonrpc" value must be "2.0"') - if not 'method' in request: + if 'method' not in request: raise JsonRpcInvalidRequestError( data='"method" member must be included') if not isinstance(request['method'], unicode): @@ -169,7 +169,7 @@ class JsonRpcWrapper(object): data='"method" must be a string') def _get_params(self, request): - if not 'params' in request: + if 'params' not in request: return [], {} params = request['params'] if isinstance(params, list): diff --git a/tests/audio/test_actor.py b/tests/audio/test_actor.py index 3f7e56ce..8263d769 100644 --- a/tests/audio/test_actor.py +++ b/tests/audio/test_actor.py @@ -154,7 +154,7 @@ class AudioStateTest(unittest.TestCase): self.audio._on_playbin_state_changed( gst.STATE_PAUSED, gst.STATE_READY, gst.STATE_NULL) # We never get the following call, so the logic must work without it - #self.audio._on_playbin_state_changed( - # gst.STATE_READY, gst.STATE_NULL, gst.STATE_VOID_PENDING) + # self.audio._on_playbin_state_changed( + # gst.STATE_READY, gst.STATE_NULL, gst.STATE_VOID_PENDING) self.assertEqual(audio.PlaybackState.STOPPED, self.audio.state) diff --git a/tests/audio/test_playlists.py b/tests/audio/test_playlists.py index 0f031736..26a8634e 100644 --- a/tests/audio/test_playlists.py +++ b/tests/audio/test_playlists.py @@ -1,4 +1,4 @@ -#encoding: utf-8 +# encoding: utf-8 from __future__ import unicode_literals diff --git a/tests/mpd/protocol/test_music_db.py b/tests/mpd/protocol/test_music_db.py index 93e45a2e..29738934 100644 --- a/tests/mpd/protocol/test_music_db.py +++ b/tests/mpd/protocol/test_music_db.py @@ -559,7 +559,7 @@ class MusicDatabaseListTest(protocol.BaseTestCase): self.sendRequest('list "foo"') self.assertEqualResponse('ACK [2@0] {list} incorrect arguments') - ### Artist + # Artist def test_list_artist_with_quotes(self): self.sendRequest('list "artist"') @@ -619,7 +619,7 @@ class MusicDatabaseListTest(protocol.BaseTestCase): self.assertNotInResponse('Artist: ') self.assertInResponse('OK') - ### Albumartist + # Albumartist def test_list_albumartist_with_quotes(self): self.sendRequest('list "albumartist"') @@ -682,7 +682,7 @@ class MusicDatabaseListTest(protocol.BaseTestCase): self.assertNotInResponse('Performer: ') self.assertInResponse('OK') - ### Composer + # Composer def test_list_composer_with_quotes(self): self.sendRequest('list "composer"') @@ -745,7 +745,7 @@ class MusicDatabaseListTest(protocol.BaseTestCase): self.assertNotInResponse('Performer: ') self.assertInResponse('OK') - ### Performer + # Performer def test_list_performer_with_quotes(self): self.sendRequest('list "performer"') @@ -808,7 +808,7 @@ class MusicDatabaseListTest(protocol.BaseTestCase): self.assertNotInResponse('Performer: ') self.assertInResponse('OK') - ### Album + # Album def test_list_album_with_quotes(self): self.sendRequest('list "album"') @@ -879,7 +879,7 @@ class MusicDatabaseListTest(protocol.BaseTestCase): self.assertNotInResponse('Album: ') self.assertInResponse('OK') - ### Date + # Date def test_list_date_with_quotes(self): self.sendRequest('list "date"') @@ -934,7 +934,7 @@ class MusicDatabaseListTest(protocol.BaseTestCase): self.assertNotInResponse('Date: ') self.assertInResponse('OK') - ### Genre + # Genre def test_list_genre_with_quotes(self): self.sendRequest('list "genre"') diff --git a/tests/mpd/test_commands.py b/tests/mpd/test_commands.py index 91a9125a..bb4effb8 100644 --- a/tests/mpd/test_commands.py +++ b/tests/mpd/test_commands.py @@ -1,4 +1,4 @@ -#encoding: utf-8 +# encoding: utf-8 from __future__ import unicode_literals diff --git a/tests/mpd/test_tokenizer.py b/tests/mpd/test_tokenizer.py index 546df847..01ecd17d 100644 --- a/tests/mpd/test_tokenizer.py +++ b/tests/mpd/test_tokenizer.py @@ -1,4 +1,4 @@ -#encoding: utf-8 +# encoding: utf-8 from __future__ import unicode_literals diff --git a/tests/mpd/test_translator.py b/tests/mpd/test_translator.py index c2648311..50d838bc 100644 --- a/tests/mpd/test_translator.py +++ b/tests/mpd/test_translator.py @@ -13,7 +13,8 @@ class TrackMpdFormatTest(unittest.TestCase): uri='a uri', artists=[Artist(name='an artist')], name='a name', - album=Album(name='an album', num_tracks=13, + album=Album( + name='an album', num_tracks=13, artists=[Artist(name='an other artist')]), track_no=7, composers=[Artist(name='a composer')],