From 305a76486d59a4fd24f335b16c80854dd0a232df Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Mon, 22 Sep 2014 21:42:57 +0200
Subject: [PATCH] models: Hide empty lists from repr()

---
 docs/changelog.rst   |  4 ++++
 mopidy/models.py     |  2 ++
 tests/test_models.py | 21 ++++++++-------------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 0ff362f8..04752b88 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -41,6 +41,10 @@ v0.20.0 (UNRELEASED)
   make sense for a server such as Mopidy. Currently the only way to find out if
   it is in use and will be missed is to go ahead and remove it.
 
+**Models**
+
+- Hide empty collections from :func:`repr()` representations.
+
 
 v0.19.4 (2014-09-01)
 ====================
diff --git a/mopidy/models.py b/mopidy/models.py
index 42313922..83888ae5 100644
--- a/mopidy/models.py
+++ b/mopidy/models.py
@@ -29,6 +29,8 @@ class ImmutableObject(object):
         kwarg_pairs = []
         for (key, value) in sorted(self.__dict__.items()):
             if isinstance(value, (frozenset, tuple)):
+                if not value:
+                    continue
                 value = list(value)
             kwarg_pairs.append('%s=%s' % (key, repr(value)))
         return '%(classname)s(%(kwargs)s)' % {
diff --git a/tests/test_models.py b/tests/test_models.py
index 43343ce7..448d6208 100644
--- a/tests/test_models.py
+++ b/tests/test_models.py
@@ -318,13 +318,12 @@ class AlbumTest(unittest.TestCase):
 
     def test_repr_without_artists(self):
         self.assertEquals(
-            "Album(artists=[], images=[], name=u'name', uri=u'uri')",
+            "Album(name=u'name', uri=u'uri')",
             repr(Album(uri='uri', name='name')))
 
     def test_repr_with_artists(self):
         self.assertEquals(
-            "Album(artists=[Artist(name=u'foo')], images=[], name=u'name', "
-            "uri=u'uri')",
+            "Album(artists=[Artist(name=u'foo')], name=u'name', uri=u'uri')",
             repr(Album(uri='uri', name='name', artists=[Artist(name='foo')])))
 
     def test_serialize_without_artists(self):
@@ -551,14 +550,12 @@ class TrackTest(unittest.TestCase):
 
     def test_repr_without_artists(self):
         self.assertEquals(
-            "Track(artists=[], composers=[], name=u'name', "
-            "performers=[], uri=u'uri')",
+            "Track(name=u'name', uri=u'uri')",
             repr(Track(uri='uri', name='name')))
 
     def test_repr_with_artists(self):
         self.assertEquals(
-            "Track(artists=[Artist(name=u'foo')], composers=[], name=u'name', "
-            "performers=[], uri=u'uri')",
+            "Track(artists=[Artist(name=u'foo')], name=u'name', uri=u'uri')",
             repr(Track(uri='uri', name='name', artists=[Artist(name='foo')])))
 
     def test_serialize_without_artists(self):
@@ -773,8 +770,7 @@ class TlTrackTest(unittest.TestCase):
 
     def test_repr(self):
         self.assertEquals(
-            "TlTrack(tlid=123, track=Track(artists=[], composers=[], "
-            "performers=[], uri=u'uri'))",
+            "TlTrack(tlid=123, track=Track(uri=u'uri'))",
             repr(TlTrack(tlid=123, track=Track(uri='uri'))))
 
     def test_serialize(self):
@@ -903,13 +899,12 @@ class PlaylistTest(unittest.TestCase):
 
     def test_repr_without_tracks(self):
         self.assertEquals(
-            "Playlist(name=u'name', tracks=[], uri=u'uri')",
+            "Playlist(name=u'name', uri=u'uri')",
             repr(Playlist(uri='uri', name='name')))
 
     def test_repr_with_tracks(self):
         self.assertEquals(
-            "Playlist(name=u'name', tracks=[Track(artists=[], composers=[], "
-            "name=u'foo', performers=[])], uri=u'uri')",
+            "Playlist(name=u'name', tracks=[Track(name=u'foo')], uri=u'uri')",
             repr(Playlist(uri='uri', name='name', tracks=[Track(name='foo')])))
 
     def test_serialize_without_tracks(self):
@@ -1036,7 +1031,7 @@ class SearchResultTest(unittest.TestCase):
 
     def test_repr_without_results(self):
         self.assertEquals(
-            "SearchResult(albums=[], artists=[], tracks=[], uri=u'uri')",
+            "SearchResult(uri=u'uri')",
             repr(SearchResult(uri='uri')))
 
     def test_serialize_without_results(self):