From 96ac806d8fb7344d806f1a7d0703a3cb4d740c0d Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Sun, 8 Aug 2010 17:17:38 +0200
Subject: [PATCH] Remove Track.id field

---
 docs/changes.rst     |  4 ++++
 mopidy/models.py     |  5 -----
 tests/models_test.py | 26 ++++----------------------
 3 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/docs/changes.rst b/docs/changes.rst
index b9981c53..a4bb002e 100644
--- a/docs/changes.rst
+++ b/docs/changes.rst
@@ -15,6 +15,10 @@ Another great release.
 - Exit early if not Python >= 2.6, < 3.
 - Include Sphinx scripts for building docs, pylintrc, tests and test data in
   the packages created by ``setup.py`` for i.e. PyPI.
+- Backend API:
+
+  - The ``id`` field of :class:`mopidy.models.Track` has been removed, as it is
+    no longer needed after the CPID refactoring.
 
 
 0.1.0a3 (2010-08-03)
diff --git a/mopidy/models.py b/mopidy/models.py
index 09a509dc..5a75e620 100644
--- a/mopidy/models.py
+++ b/mopidy/models.py
@@ -103,8 +103,6 @@ class Track(ImmutableObject):
     :type length: integer
     :param bitrate: bitrate in kbit/s
     :type bitrate: integer
-    :param id: track ID (unique and non-changing as long as the process lives)
-    :type id: integer
     """
 
     #: The track URI. Read-only.
@@ -128,9 +126,6 @@ class Track(ImmutableObject):
     #: The track's bitrate in kbit/s. Read-only.
     bitrate = None
 
-    #: The track ID. Read-only.
-    id = None
-
     def __init__(self, *args, **kwargs):
         self._artists = frozenset(kwargs.pop('artists', []))
         super(Track, self).__init__(*args, **kwargs)
diff --git a/tests/models_test.py b/tests/models_test.py
index 7fab86f5..ab7bc793 100644
--- a/tests/models_test.py
+++ b/tests/models_test.py
@@ -222,12 +222,6 @@ class TrackTest(unittest.TestCase):
         self.assertEqual(track.bitrate, bitrate)
         self.assertRaises(AttributeError, setattr, track, 'bitrate', None)
 
-    def test_id(self):
-        track_id = 17
-        track = Track(id=track_id)
-        self.assertEqual(track.id, track_id)
-        self.assertRaises(AttributeError, setattr, track, 'id', None)
-
     def test_invalid_kwarg(self):
         test = lambda: Track(foo='baz')
         self.assertRaises(TypeError, test)
@@ -291,20 +285,14 @@ class TrackTest(unittest.TestCase):
         self.assertEqual(track1, track2)
         self.assertEqual(hash(track1), hash(track2))
 
-    def test_eq_id(self):
-        track1 = Track(id=100)
-        track2 = Track(id=100)
-        self.assertEqual(track1, track2)
-        self.assertEqual(hash(track1), hash(track2))
-
     def test_eq(self):
         date = dt.date.today()
         artists = [Artist()]
         album = Album()
         track1 = Track(uri=u'uri', name=u'name', artists=artists, album=album,
-            track_no=1, date=date, length=100, bitrate=100, id=2)
+            track_no=1, date=date, length=100, bitrate=100)
         track2 = Track(uri=u'uri', name=u'name', artists=artists, album=album,
-            track_no=1, date=date, length=100, bitrate=100, id=2)
+            track_no=1, date=date, length=100, bitrate=100)
         self.assertEqual(track1, track2)
         self.assertEqual(hash(track1), hash(track2))
 
@@ -362,20 +350,14 @@ class TrackTest(unittest.TestCase):
         self.assertNotEqual(track1, track2)
         self.assertNotEqual(hash(track1), hash(track2))
 
-    def test_ne_id(self):
-        track1 = Track(id=100)
-        track2 = Track(id=200)
-        self.assertNotEqual(track1, track2)
-        self.assertNotEqual(hash(track1), hash(track2))
-
     def test_ne(self):
         track1 = Track(uri=u'uri1', name=u'name1',
             artists=[Artist(name=u'name1')], album=Album(name=u'name1'),
-            track_no=1, date=dt.date.today(), length=100, bitrate=100, id=2)
+            track_no=1, date=dt.date.today(), length=100, bitrate=100)
         track2 = Track(uri=u'uri2', name=u'name2',
             artists=[Artist(name=u'name2')], album=Album(name=u'name2'),
             track_no=2, date=dt.date.today()-dt.timedelta(days=1),
-            length=200, bitrate=200, id=1)
+            length=200, bitrate=200)
         self.assertNotEqual(track1, track2)
         self.assertNotEqual(hash(track1), hash(track2))