diff --git a/mopidy/audio/actor.py b/mopidy/audio/actor.py index d78df9b7..c11d79b3 100644 --- a/mopidy/audio/actor.py +++ b/mopidy/audio/actor.py @@ -35,8 +35,8 @@ MB = 1 << 20 # GST_PLAY_FLAG_SOFT_COLORBALANCE (1<<10) # Default flags to use for playbin: AUDIO, SOFT_VOLUME, DOWNLOAD -PLAYBIN_FLAGS = (1<<1) | (1<<4) | (1<<7) -PLAYBIN_VIS_FLAGS = PLAYBIN_FLAGS | (1<<3) +PLAYBIN_FLAGS = (1 << 1) | (1 << 4) | (1 << 7) +PLAYBIN_VIS_FLAGS = PLAYBIN_FLAGS | (1 << 3) class Audio(pykka.ThreadingActor): @@ -175,7 +175,8 @@ class Audio(pykka.ThreadingActor): logger.info('Audio visualizer set to "%s"', visualizer_element) except gobject.GError as ex: logger.error( - 'Failed to create audio visualizer "%s": %s', visualizer_element, ex) + 'Failed to create audio visualizer "%s": %s', + visualizer_element, ex) def _setup_mixer(self): mixer_desc = self._config['audio']['mixer'] diff --git a/mopidy/backends/local/translator.py b/mopidy/backends/local/translator.py index b8e98dd3..7cd46fbb 100644 --- a/mopidy/backends/local/translator.py +++ b/mopidy/backends/local/translator.py @@ -2,7 +2,6 @@ from __future__ import unicode_literals import logging import os -import urllib import urlparse from mopidy.models import Track, Artist, Album diff --git a/mopidy/backends/spotify/translator.py b/mopidy/backends/spotify/translator.py index 5813f880..f35cad2e 100644 --- a/mopidy/backends/spotify/translator.py +++ b/mopidy/backends/spotify/translator.py @@ -67,7 +67,8 @@ def to_mopidy_track(spotify_track, bitrate=None): return track_cache[uri] -def to_mopidy_playlist(spotify_playlist, folders=None, bitrate=None, username=None): +def to_mopidy_playlist( + spotify_playlist, folders=None, bitrate=None, username=None): if spotify_playlist is None or spotify_playlist.type() != 'playlist': return try: diff --git a/mopidy/config/types.py b/mopidy/config/types.py index 29651940..d3cd2462 100644 --- a/mopidy/config/types.py +++ b/mopidy/config/types.py @@ -111,7 +111,8 @@ class Secret(ConfigValue): class Integer(ConfigValue): """Integer value.""" - def __init__(self, minimum=None, maximum=None, choices=None, optional=False): + def __init__( + self, minimum=None, maximum=None, choices=None, optional=False): self._required = not optional self._minimum = minimum self._maximum = maximum diff --git a/mopidy/core/library.py b/mopidy/core/library.py index 50d75144..cdc3f53a 100644 --- a/mopidy/core/library.py +++ b/mopidy/core/library.py @@ -69,8 +69,9 @@ class LibraryController(object): """ query = query or kwargs futures = [ - backend.library.find_exact(query=query, uris=uris) - for (backend, uris) in self._get_backends_to_uris(uris).items()] + backend.library.find_exact(query=query, uris=backend_uris) + for (backend, backend_uris) + in self._get_backends_to_uris(uris).items()] return [result for result in pykka.get_all(futures) if result] def lookup(self, uri): @@ -145,6 +146,7 @@ class LibraryController(object): """ query = query or kwargs futures = [ - backend.library.search(query=query, uris=uris) - for (backend, uris) in self._get_backends_to_uris(uris).items()] + backend.library.search(query=query, uris=backend_uris) + for (backend, backend_uris) + in self._get_backends_to_uris(uris).items()] return [result for result in pykka.get_all(futures) if result] diff --git a/mopidy/ext.py b/mopidy/ext.py index 22daa3cb..5db7c093 100644 --- a/mopidy/ext.py +++ b/mopidy/ext.py @@ -82,7 +82,8 @@ class Extension(object): def get_library_updaters(self): """List of library updater classes - :returns: list of :class:`~mopidy.backends.base.BaseLibraryUpdateProvider` + :returns: list of + :class:`~mopidy.backends.base.BaseLibraryUpdateProvider` subclasses """ return [] diff --git a/mopidy/scanner.py b/mopidy/scanner.py index 4632cebe..81ac5c53 100644 --- a/mopidy/scanner.py +++ b/mopidy/scanner.py @@ -192,7 +192,8 @@ def translator(data): class Scanner(object): - def __init__(self, uris, data_callback, error_callback=None, scan_timeout=1000): + def __init__( + self, uris, data_callback, error_callback=None, scan_timeout=1000): self.data = {} self.uris = iter(uris) self.data_callback = data_callback @@ -298,7 +299,8 @@ class Scanner(object): return False self.pipe.set_state(gst.STATE_NULL) self.uribin.set_property('uri', uri) - self.timeout_id = gobject.timeout_add(self.scan_timeout, self.process_timeout) + self.timeout_id = gobject.timeout_add( + self.scan_timeout, self.process_timeout) self.pipe.set_state(gst.STATE_PLAYING) return True diff --git a/tests/backends/local/playlists_test.py b/tests/backends/local/playlists_test.py index 591a9d1d..d405e887 100644 --- a/tests/backends/local/playlists_test.py +++ b/tests/backends/local/playlists_test.py @@ -7,7 +7,6 @@ import unittest from mopidy.backends.local import actor from mopidy.models import Track -from mopidy.utils.path import path_to_uri, uri_to_path from tests import path_to_data_dir from tests.backends.base.playlists import ( @@ -100,8 +99,6 @@ class LocalPlaylistsControllerTest( self.assertEqual(track.uri, contents.strip()) def test_playlists_are_loaded_at_startup(self): - playlist_path = os.path.join(self.playlists_dir, 'test.m3u') - track = Track(uri='local:track:path2') playlist = self.core.playlists.create('test') playlist = playlist.copy(tracks=[track]) diff --git a/tests/config/schemas_test.py b/tests/config/schemas_test.py index 8bcfc651..9da8f667 100644 --- a/tests/config/schemas_test.py +++ b/tests/config/schemas_test.py @@ -81,7 +81,8 @@ class ConfigSchemaTest(unittest.TestCase): class LogLevelConfigSchemaTest(unittest.TestCase): def test_conversion(self): schema = schemas.LogLevelConfigSchema('test') - result, errors = schema.deserialize({'foo.bar': 'DEBUG', 'baz': 'INFO'}) + result, errors = schema.deserialize( + {'foo.bar': 'DEBUG', 'baz': 'INFO'}) self.assertEqual(logging.DEBUG, result['foo.bar']) self.assertEqual(logging.INFO, result['baz']) diff --git a/tests/frontends/mpd/protocol/stored_playlists_test.py b/tests/frontends/mpd/protocol/stored_playlists_test.py index 820096f4..d75944c4 100644 --- a/tests/frontends/mpd/protocol/stored_playlists_test.py +++ b/tests/frontends/mpd/protocol/stored_playlists_test.py @@ -10,8 +10,8 @@ from tests.frontends.mpd import protocol class PlaylistsHandlerTest(protocol.BaseTestCase): def test_listplaylist(self): self.backend.playlists.playlists = [ - Playlist(name='name', uri='dummy:name', - tracks=[Track(uri='dummy:a')])] + Playlist( + name='name', uri='dummy:name', tracks=[Track(uri='dummy:a')])] self.sendRequest('listplaylist "name"') self.assertInResponse('file: dummy:a') @@ -19,8 +19,8 @@ class PlaylistsHandlerTest(protocol.BaseTestCase): def test_listplaylist_without_quotes(self): self.backend.playlists.playlists = [ - Playlist(name='name', uri='dummy:name', - tracks=[Track(uri='dummy:a')])] + Playlist( + name='name', uri='dummy:name', tracks=[Track(uri='dummy:a')])] self.sendRequest('listplaylist name') self.assertInResponse('file: dummy:a') @@ -41,8 +41,8 @@ class PlaylistsHandlerTest(protocol.BaseTestCase): def test_listplaylistinfo(self): self.backend.playlists.playlists = [ - Playlist(name='name', uri='dummy:name', - tracks=[Track(uri='dummy:a')])] + Playlist( + name='name', uri='dummy:name', tracks=[Track(uri='dummy:a')])] self.sendRequest('listplaylistinfo "name"') self.assertInResponse('file: dummy:a') @@ -52,8 +52,8 @@ class PlaylistsHandlerTest(protocol.BaseTestCase): def test_listplaylistinfo_without_quotes(self): self.backend.playlists.playlists = [ - Playlist(name='name', uri='dummy:name', - tracks=[Track(uri='dummy:a')])] + Playlist( + name='name', uri='dummy:name', tracks=[Track(uri='dummy:a')])] self.sendRequest('listplaylistinfo name') self.assertInResponse('file: dummy:a') @@ -109,7 +109,7 @@ class PlaylistsHandlerTest(protocol.BaseTestCase): def test_listplaylists_replaces_newline_with_space(self): self.backend.playlists.playlists = [ - Playlist(name='a\n', uri='dummy:')] + Playlist(name='a\n', uri='dummy:')] self.sendRequest('listplaylists') self.assertInResponse('playlist: a ') self.assertNotInResponse('playlist: a\n') @@ -117,7 +117,7 @@ class PlaylistsHandlerTest(protocol.BaseTestCase): def test_listplaylists_replaces_carriage_return_with_space(self): self.backend.playlists.playlists = [ - Playlist(name='a\r', uri='dummy:')] + Playlist(name='a\r', uri='dummy:')] self.sendRequest('listplaylists') self.assertInResponse('playlist: a ') self.assertNotInResponse('playlist: a\r') @@ -125,7 +125,7 @@ class PlaylistsHandlerTest(protocol.BaseTestCase): def test_listplaylists_replaces_forward_slash_with_space(self): self.backend.playlists.playlists = [ - Playlist(name='a/', uri='dummy:')] + Playlist(name='a/', uri='dummy:')] self.sendRequest('listplaylists') self.assertInResponse('playlist: a ') self.assertNotInResponse('playlist: a/')