diff --git a/mopidy/audio/actor.py b/mopidy/audio/actor.py index a23c4c43..7de98075 100644 --- a/mopidy/audio/actor.py +++ b/mopidy/audio/actor.py @@ -89,7 +89,8 @@ class Audio(pykka.ThreadingActor): b'rate=(int)44100') source = element.get_property('source') source.set_property('caps', default_caps) - source.set_property('format', b'time') # Gstreamer does not like unicode + # GStreamer does not like unicode + source.set_property('format', b'time') self._appsrc = source @@ -219,8 +220,8 @@ class Audio(pykka.ThreadingActor): logger.debug( 'Triggering event: state_changed(old_state=%s, new_state=%s)', old_state, new_state) - AudioListener.send('state_changed', - old_state=old_state, new_state=new_state) + AudioListener.send( + 'state_changed', old_state=old_state, new_state=new_state) def _on_end_of_stream(self): logger.debug('Triggering reached_end_of_stream event') diff --git a/mopidy/core/library.py b/mopidy/core/library.py index 58263fd1..6e421595 100644 --- a/mopidy/core/library.py +++ b/mopidy/core/library.py @@ -36,8 +36,8 @@ class LibraryController(object): :type query: dict :rtype: :class:`mopidy.models.Playlist` """ - futures = [b.library.find_exact(**query) - for b in self.backends.with_library] + futures = [ + b.library.find_exact(**query) for b in self.backends.with_library] results = pykka.get_all(futures) return Playlist(tracks=[ track for playlist in results for track in playlist.tracks]) @@ -68,8 +68,8 @@ class LibraryController(object): if backend: backend.library.refresh(uri).get() else: - futures = [b.library.refresh(uri) - for b in self.backends.with_library] + futures = [ + b.library.refresh(uri) for b in self.backends.with_library] pykka.get_all(futures) def search(self, **query): @@ -89,8 +89,8 @@ class LibraryController(object): :type query: dict :rtype: :class:`mopidy.models.Playlist` """ - futures = [b.library.search(**query) - for b in self.backends.with_library] + futures = [ + b.library.search(**query) for b in self.backends.with_library] results = pykka.get_all(futures) track_lists = [playlist.tracks for playlist in results] tracks = list(itertools.chain(*track_lists)) diff --git a/mopidy/utils/process.py b/mopidy/utils/process.py index 27e312de..5edf287e 100644 --- a/mopidy/utils/process.py +++ b/mopidy/utils/process.py @@ -16,7 +16,8 @@ from mopidy import exceptions logger = logging.getLogger('mopidy.utils.process') -SIGNALS = dict((k, v) for v, k in signal.__dict__.iteritems() +SIGNALS = dict( + (k, v) for v, k in signal.__dict__.iteritems() if v.startswith('SIG') and not v.startswith('SIG_')) @@ -98,7 +99,8 @@ class DebugThread(threading.Thread): for ident, frame in sys._current_frames().items(): if self.ident != ident: stack = ''.join(traceback.format_stack(frame)) - logger.debug('Current state of %s (%s):\n%s', + logger.debug( + 'Current state of %s (%s):\n%s', threads[ident], ident, stack) del frame diff --git a/tests/core/playback_test.py b/tests/core/playback_test.py index 8e83f971..bb3d359f 100644 --- a/tests/core/playback_test.py +++ b/tests/core/playback_test.py @@ -58,8 +58,8 @@ class CorePlaybackTest(unittest.TestCase): self.playback1.play.assert_called_once_with(self.tracks[3]) self.assertFalse(self.playback2.play.called) - self.assertEqual(self.core.playback.current_tl_track, - self.tl_tracks[3]) + self.assertEqual( + self.core.playback.current_tl_track, self.tl_tracks[3]) def test_pause_selects_dummy1_backend(self): self.core.playback.play(self.tl_tracks[0]) diff --git a/tests/frontends/mpd/protocol/playback_test.py b/tests/frontends/mpd/protocol/playback_test.py index 51468390..f81be241 100644 --- a/tests/frontends/mpd/protocol/playback_test.py +++ b/tests/frontends/mpd/protocol/playback_test.py @@ -236,8 +236,8 @@ class PlaybackControlHandlerTest(protocol.BaseTestCase): self.sendRequest('play "-1"') self.assertEqual(PLAYING, self.core.playback.state.get()) - self.assertEqual('dummy:a', - self.core.playback.current_track.get().uri) + self.assertEqual( + 'dummy:a', self.core.playback.current_track.get().uri) self.assertInResponse('OK') def test_play_minus_one_plays_current_track_if_current_track_is_set(self): @@ -253,8 +253,8 @@ class PlaybackControlHandlerTest(protocol.BaseTestCase): self.sendRequest('play "-1"') self.assertEqual(PLAYING, self.core.playback.state.get()) - self.assertEqual('dummy:b', - self.core.playback.current_track.get().uri) + self.assertEqual( + 'dummy:b', self.core.playback.current_track.get().uri) self.assertInResponse('OK') def test_play_minus_one_on_empty_playlist_does_not_ack(self): @@ -318,8 +318,8 @@ class PlaybackControlHandlerTest(protocol.BaseTestCase): self.sendRequest('playid "-1"') self.assertEqual(PLAYING, self.core.playback.state.get()) - self.assertEqual('dummy:a', - self.core.playback.current_track.get().uri) + self.assertEqual( + 'dummy:a', self.core.playback.current_track.get().uri) self.assertInResponse('OK') def test_playid_minus_1_plays_current_track_if_current_track_is_set(self): @@ -335,8 +335,8 @@ class PlaybackControlHandlerTest(protocol.BaseTestCase): self.sendRequest('playid "-1"') self.assertEqual(PLAYING, self.core.playback.state.get()) - self.assertEqual('dummy:b', - self.core.playback.current_track.get().uri) + self.assertEqual( + 'dummy:b', self.core.playback.current_track.get().uri) self.assertInResponse('OK') def test_playid_minus_one_on_empty_playlist_does_not_ack(self): diff --git a/tests/frontends/mpd/protocol/regression_test.py b/tests/frontends/mpd/protocol/regression_test.py index 68230c6a..6b8832e4 100644 --- a/tests/frontends/mpd/protocol/regression_test.py +++ b/tests/frontends/mpd/protocol/regression_test.py @@ -29,22 +29,22 @@ class IssueGH17RegressionTest(protocol.BaseTestCase): random.seed(1) # Playlist order: abcfde self.sendRequest('play') - self.assertEquals('dummy:a', - self.core.playback.current_track.get().uri) + self.assertEquals( + 'dummy:a', self.core.playback.current_track.get().uri) self.sendRequest('random "1"') self.sendRequest('next') - self.assertEquals('dummy:b', - self.core.playback.current_track.get().uri) + self.assertEquals( + 'dummy:b', self.core.playback.current_track.get().uri) self.sendRequest('next') # Should now be at track 'c', but playback fails and it skips ahead - self.assertEquals('dummy:f', - self.core.playback.current_track.get().uri) + self.assertEquals( + 'dummy:f', self.core.playback.current_track.get().uri) self.sendRequest('next') - self.assertEquals('dummy:d', - self.core.playback.current_track.get().uri) + self.assertEquals( + 'dummy:d', self.core.playback.current_track.get().uri) self.sendRequest('next') - self.assertEquals('dummy:e', - self.core.playback.current_track.get().uri) + self.assertEquals( + 'dummy:e', self.core.playback.current_track.get().uri) class IssueGH18RegressionTest(protocol.BaseTestCase):