From 2f2716767791cd21e51570b1d5a3d19115180419 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Tue, 20 Nov 2012 09:44:09 +0100 Subject: [PATCH] core: Remove playback.track_at_previous --- docs/changes.rst | 3 +++ mopidy/core/playback.py | 11 ----------- tests/backends/base/playback.py | 16 +++++++++------- 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/docs/changes.rst b/docs/changes.rst index a3891424..77c418bf 100644 --- a/docs/changes.rst +++ b/docs/changes.rst @@ -149,6 +149,9 @@ backends: This makes it possible to support lookup of artist or album URIs which then can expand to a list of tracks. +- Remove :attr:`mopidy.core.PlaybackController.track_at_previous`. Use + :attr:`mopidy.core.PlaybackController.tl_track_at_previous` instead. + - Remove :attr:`mopidy.core.PlaybackController.track_at_next`. Use :attr:`mopidy.core.PlaybackController.tl_track_at_next` instead. diff --git a/mopidy/core/playback.py b/mopidy/core/playback.py index cab2c392..901c7e34 100644 --- a/mopidy/core/playback.py +++ b/mopidy/core/playback.py @@ -196,17 +196,6 @@ class PlaybackController(object): before the list repeats. """ - def get_track_at_previous(self): - return self.tl_track_at_previous and self.tl_track_at_previous.track - - track_at_previous = property(get_track_at_previous) - """ - The track that will be played if calling :meth:`previous()`. - - Read-only. A :class:`mopidy.models.Track` extracted from - :attr:`tl_track_at_previous` for convenience. - """ - def get_tl_track_at_previous(self): if self.repeat or self.consume or self.random: return self.current_tl_track diff --git a/tests/backends/base/playback.py b/tests/backends/base/playback.py index 619efbb2..fffe09da 100644 --- a/tests/backends/base/playback.py +++ b/tests/backends/base/playback.py @@ -434,18 +434,18 @@ class PlaybackControllerTest(object): @populate_tracklist def test_previous_track_before_play(self): - self.assertEqual(self.playback.track_at_previous, None) + self.assertEqual(self.playback.tl_track_at_previous, None) @populate_tracklist def test_previous_track_after_play(self): self.playback.play() - self.assertEqual(self.playback.track_at_previous, None) + self.assertEqual(self.playback.tl_track_at_previous, None) @populate_tracklist def test_previous_track_after_next(self): self.playback.play() self.playback.next() - self.assertEqual(self.playback.track_at_previous, self.tracks[0]) + self.assertEqual(self.playback.tl_track_at_previous, self.tl_tracks[0]) @populate_tracklist def test_previous_track_after_previous(self): @@ -453,10 +453,10 @@ class PlaybackControllerTest(object): self.playback.next() # At track 1 self.playback.next() # At track 2 self.playback.previous() # At track 1 - self.assertEqual(self.playback.track_at_previous, self.tracks[0]) + self.assertEqual(self.playback.tl_track_at_previous, self.tl_tracks[0]) def test_previous_track_empty_playlist(self): - self.assertEqual(self.playback.track_at_previous, None) + self.assertEqual(self.playback.tl_track_at_previous, None) @populate_tracklist def test_previous_track_with_consume(self): @@ -464,7 +464,8 @@ class PlaybackControllerTest(object): for _ in self.tracks: self.playback.next() self.assertEqual( - self.playback.track_at_previous, self.playback.current_track) + self.playback.tl_track_at_previous, + self.playback.current_tl_track) @populate_tracklist def test_previous_track_with_random(self): @@ -472,7 +473,8 @@ class PlaybackControllerTest(object): for _ in self.tracks: self.playback.next() self.assertEqual( - self.playback.track_at_previous, self.playback.current_track) + self.playback.tl_track_at_previous, + self.playback.current_tl_track) @populate_tracklist def test_initial_current_track(self):