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

models: Hide empty lists from repr()

Browse Source 
(cherry picked from commit 305a76486d)

Conflicts:
	docs/changelog.rst
This commit is contained in:
Stein Magnus Jodal 2014-09-22 21:42:57 +02:00
parent aede889203
commit 88d64044de
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/changelog.rst
View File

@ -5,6 +5,12 @@ Changelog
This changelog is used to track all major changes to Mopidy. This changelog is used to track all major changes to Mopidy.
v0.19.5 (UNRELEASED)
====================
- Models: Hide empty collections from :func:`repr()` representations.
v0.19.4 (2014-09-01) v0.19.4 (2014-09-01)
==================== ====================

2
mopidy/models.py
View File

@ -29,6 +29,8 @@ class ImmutableObject(object):
kwarg_pairs = [] kwarg_pairs = []
for (key, value) in sorted(self.__dict__.items()): for (key, value) in sorted(self.__dict__.items()):
if isinstance(value, (frozenset, tuple)): if isinstance(value, (frozenset, tuple)):
if not value:
continue
value = list(value) value = list(value)
kwarg_pairs.append('%s=%s' % (key, repr(value))) kwarg_pairs.append('%s=%s' % (key, repr(value)))
return '%(classname)s(%(kwargs)s)' % { return '%(classname)s(%(kwargs)s)' % {

21
tests/test_models.py
View File

@ -318,13 +318,12 @@ class AlbumTest(unittest.TestCase):
def test_repr_without_artists(self): def test_repr_without_artists(self):
self.assertEquals( self.assertEquals(
"Album(artists=[], images=[], name=u'name', uri=u'uri')", "Album(name=u'name', uri=u'uri')",
repr(Album(uri='uri', name='name'))) repr(Album(uri='uri', name='name')))
def test_repr_with_artists(self): def test_repr_with_artists(self):
self.assertEquals( self.assertEquals(
"Album(artists=[Artist(name=u'foo')], images=[], name=u'name', " "Album(artists=[Artist(name=u'foo')], name=u'name', uri=u'uri')",
"uri=u'uri')",
repr(Album(uri='uri', name='name', artists=[Artist(name='foo')]))) repr(Album(uri='uri', name='name', artists=[Artist(name='foo')])))
def test_serialize_without_artists(self): def test_serialize_without_artists(self):
@ -551,14 +550,12 @@ class TrackTest(unittest.TestCase):
def test_repr_without_artists(self): def test_repr_without_artists(self):
self.assertEquals( self.assertEquals(
"Track(artists=[], composers=[], name=u'name', " "Track(name=u'name', uri=u'uri')",
"performers=[], uri=u'uri')",
repr(Track(uri='uri', name='name'))) repr(Track(uri='uri', name='name')))
def test_repr_with_artists(self): def test_repr_with_artists(self):
self.assertEquals( self.assertEquals(
"Track(artists=[Artist(name=u'foo')], composers=[], name=u'name', " "Track(artists=[Artist(name=u'foo')], name=u'name', uri=u'uri')",
"performers=[], uri=u'uri')",
repr(Track(uri='uri', name='name', artists=[Artist(name='foo')]))) repr(Track(uri='uri', name='name', artists=[Artist(name='foo')])))
def test_serialize_without_artists(self): def test_serialize_without_artists(self):
@ -773,8 +770,7 @@ class TlTrackTest(unittest.TestCase):
def test_repr(self): def test_repr(self):
self.assertEquals( self.assertEquals(
"TlTrack(tlid=123, track=Track(artists=[], composers=[], " "TlTrack(tlid=123, track=Track(uri=u'uri'))",
"performers=[], uri=u'uri'))",
repr(TlTrack(tlid=123, track=Track(uri='uri')))) repr(TlTrack(tlid=123, track=Track(uri='uri'))))
def test_serialize(self): def test_serialize(self):
@ -903,13 +899,12 @@ class PlaylistTest(unittest.TestCase):
def test_repr_without_tracks(self): def test_repr_without_tracks(self):
self.assertEquals( self.assertEquals(
"Playlist(name=u'name', tracks=[], uri=u'uri')", "Playlist(name=u'name', uri=u'uri')",
repr(Playlist(uri='uri', name='name'))) repr(Playlist(uri='uri', name='name')))
def test_repr_with_tracks(self): def test_repr_with_tracks(self):
self.assertEquals( self.assertEquals(
"Playlist(name=u'name', tracks=[Track(artists=[], composers=[], " "Playlist(name=u'name', tracks=[Track(name=u'foo')], uri=u'uri')",
"name=u'foo', performers=[])], uri=u'uri')",
repr(Playlist(uri='uri', name='name', tracks=[Track(name='foo')]))) repr(Playlist(uri='uri', name='name', tracks=[Track(name='foo')])))
def test_serialize_without_tracks(self): def test_serialize_without_tracks(self):
@ -1036,7 +1031,7 @@ class SearchResultTest(unittest.TestCase):
def test_repr_without_results(self): def test_repr_without_results(self):
self.assertEquals( self.assertEquals(
"SearchResult(albums=[], artists=[], tracks=[], uri=u'uri')", "SearchResult(uri=u'uri')",
repr(SearchResult(uri='uri'))) repr(SearchResult(uri='uri')))
def test_serialize_without_results(self): def test_serialize_without_results(self):