From 71e2b21b5204b78d2b1f2f220cbce56037532bd4 Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Wed, 18 Mar 2015 23:09:09 +0100 Subject: [PATCH] review: Minor fixes and updates --- docs/changelog.rst | 3 ++- mopidy/core/library.py | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index 33468f60..f1a33c4b 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -32,7 +32,8 @@ v0.20.0 (UNRELEASED) mute. (Fixes: :issue:`962`) - Add ``uris`` argument to :method:`mopidy.core.LibraryController.lookup` - which allows for simpler lookup of multiple URIs. (Fixes: :issue:`1008`) + which allows for simpler lookup of multiple URIs. (Fixes: :issue:`1008`, + PR: :issue:`1047`) - **Deprecated:** The old methods on :class:`mopidy.core.PlaybackController` for volume and mute management have been deprecated. (Fixes: :issue:`962`) diff --git a/mopidy/core/library.py b/mopidy/core/library.py index ec94dccf..f2a8b9bd 100644 --- a/mopidy/core/library.py +++ b/mopidy/core/library.py @@ -173,12 +173,13 @@ class LibraryController(object): :type uri: string or :class:`None` :param uris: track URIs :type uris: list of string or :class:`None` - :rtype: {uri: list of :class:`mopidy.models.Track`} + :rtype: list of :class:`mopidy.models.Track` if uri was set or + a {uri: list of :class:`mopidy.models.Track`} if uris was set. - .. versionadded:: 0.20 + .. versionadded:: 1.0 The ``uris`` argument. - .. deprecated:: 0.20 + .. deprecated:: 1.0 The ``uri`` argument. Use ``uris`` instead. """ none_set = uri is None and uris is None