From 5f627984a336896ff1add1233c70ad628b8d04bb Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Sun, 26 Apr 2015 23:35:00 +0200 Subject: [PATCH] review: Address review comments for one-of-validation --- mopidy/core/library.py | 2 +- mopidy/core/tracklist.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mopidy/core/library.py b/mopidy/core/library.py index 0f4ebac1..e6da95f1 100644 --- a/mopidy/core/library.py +++ b/mopidy/core/library.py @@ -190,7 +190,7 @@ class LibraryController(object): The ``uri`` argument. Use ``uris`` instead. """ if sum(o is not None for o in [uri, uris]) != 1: - raise ValueError("One of 'uri' or 'uris' must be set") + raise ValueError('Exactly one of "uri" or "uris" must be set') uris is None or validation.check_uris(uris) uri is None or validation.check_uri(uri) diff --git a/mopidy/core/tracklist.py b/mopidy/core/tracklist.py index 8fe3c612..692762ef 100644 --- a/mopidy/core/tracklist.py +++ b/mopidy/core/tracklist.py @@ -408,7 +408,7 @@ class TracklistController(object): """ if sum(o is not None for o in [tracks, uri, uris]) != 1: raise ValueError( - 'Exactly one of tracks, uri or uris must be provided') + 'Exactly one of "tracks", "uri" or "uris" must be set') tracks is None or validation.check_instances(tracks, Track) uri is None or validation.check_uri(uri)