From 3bc4126b45f952c254de82263fbc33b906679ea5 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Sun, 18 Nov 2012 17:28:37 +0100 Subject: [PATCH] models: Fix TlTrack deserialization --- mopidy/models.py | 2 ++ tests/models_test.py | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/mopidy/models.py b/mopidy/models.py index 9eadb314..4861ef0d 100644 --- a/mopidy/models.py +++ b/mopidy/models.py @@ -131,6 +131,8 @@ def model_json_decoder(dct): return Artist(**dct) if obj_type == 'Playlist': return Playlist(**dct) + if obj_type == 'TlTrack': + return TlTrack(**dct) if obj_type == 'Track': return Track(**dct) return dct diff --git a/tests/models_test.py b/tests/models_test.py index c49142a8..21ad7ead 100644 --- a/tests/models_test.py +++ b/tests/models_test.py @@ -622,10 +622,10 @@ class TlTrackTest(unittest.TestCase): TlTrack(tlid=123, track=track).serialize()) def test_to_json_and_back(self): - track1 = Track(uri='uri', name='name') - serialized = json.dumps(track1, cls=ModelJSONEncoder) - track2 = json.loads(serialized, object_hook=model_json_decoder) - self.assertEqual(track1, track2) + tl_track1 = TlTrack(tlid=123, track=Track(uri='uri', name='name')) + serialized = json.dumps(tl_track1, cls=ModelJSONEncoder) + tl_track2 = json.loads(serialized, object_hook=model_json_decoder) + self.assertEqual(tl_track1, tl_track2) def test_eq(self): tlid = 123