andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

core: Add "one-of" validation for number of kwargs

Browse Source
This commit is contained in:
Thomas Adamcik 2015-04-25 00:56:11 +02:00
parent b3ea425fd0
commit 30f56abc66
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mopidy/core/library.py
View File

@ -189,14 +189,9 @@ class LibraryController(object):
.. deprecated:: 1.0 .. deprecated:: 1.0
The ``uri`` argument. Use ``uris`` instead. The ``uri`` argument. Use ``uris`` instead.
""" """
none_set = uri is None and uris is None if sum(o is not None for o in [uri, uris]) != 1:
both_set = uri is not None and uris is not None
if none_set or both_set:
raise ValueError("One of 'uri' or 'uris' must be set") raise ValueError("One of 'uri' or 'uris' must be set")
# TODO: validation.one_of(*args)?
uris is None or validation.check_uris(uris) uris is None or validation.check_uris(uris)
uri is None or validation.check_uri(uri) uri is None or validation.check_uri(uri)

5
mopidy/core/playback.py
View File

@ -277,9 +277,12 @@ class PlaybackController(object):
:param tlid: TLID of the track to play :param tlid: TLID of the track to play
:type tlid: :class:`int` or :class:`None` :type tlid: :class:`int` or :class:`None`
""" """
if sum(o is not None for o in [tl_track, tlid]) > 1:
raise ValueError('At most one of "tl_track" and "tlid" may be set')
tl_track is None or validation.check_instance(tl_track, models.TlTrack) tl_track is None or validation.check_instance(tl_track, models.TlTrack)
tlid is None or validation.check_integer(tlid, min=0) tlid is None or validation.check_integer(tlid, min=0)
# TODO: check one of or none for args
if tl_track: if tl_track:
deprecation.warn('core.playback.play:tl_track_kwarg', pending=True) deprecation.warn('core.playback.play:tl_track_kwarg', pending=True)

7
mopidy/core/tracklist.py
View File

@ -406,10 +406,9 @@ class TracklistController(object):
.. deprecated:: 1.0 .. deprecated:: 1.0
The ``tracks`` and ``uri`` arguments. Use ``uris``. The ``tracks`` and ``uri`` arguments. Use ``uris``.
""" """
assert tracks is not None or uri is not None or uris is not None, \ if sum(o is not None for o in [tracks, uri, uris]) != 1:
'tracks, uri or uris must be provided' raise ValueError(
# TODO: check that only one of tracks uri and uris is set... 'Exactly one of tracks, uri or uris must be provided')
# TODO: can at_position be negative?
tracks is None or validation.check_instances(tracks, Track) tracks is None or validation.check_instances(tracks, Track)
uri is None or validation.check_uri(uri) uri is None or validation.check_uri(uri)