From 42faec8a3c8c2faaecdf90fddbf8bf79fcc8f357 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Thu, 20 Dec 2012 18:59:01 +0100 Subject: [PATCH] spotify: SpotifyTrack fails when both uri and track is provided --- mopidy/backends/spotify/library.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mopidy/backends/spotify/library.py b/mopidy/backends/spotify/library.py index dec13ced..28e9c61f 100644 --- a/mopidy/backends/spotify/library.py +++ b/mopidy/backends/spotify/library.py @@ -19,12 +19,12 @@ class SpotifyTrack(Track): """Proxy object for unloaded Spotify tracks.""" def __init__(self, uri=None, track=None): super(SpotifyTrack, self).__init__() - if uri: + if (uri and track) or (not uri and not track): + raise AttributeError('uri or track must be provided') + elif uri: self._spotify_track = Link.from_string(uri).as_track() elif track: self._spotify_track = track - else: - raise AttributeError('uri or track must be provided') self._unloaded_track = Track(uri=uri, name='[loading...]') self._track = None