From 718405421daae5bf882783fb633d4124c2a4f8eb Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Tue, 23 Sep 2014 18:32:34 +0200
Subject: [PATCH] history: Rename class to HistoryController

For consistency with other core controllers.
---
 mopidy/core/__init__.py    | 2 +-
 mopidy/core/actor.py       | 8 ++++----
 mopidy/core/history.py     | 2 +-
 tests/core/test_history.py | 5 +++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/mopidy/core/__init__.py b/mopidy/core/__init__.py
index 302c0a74..019034fc 100644
--- a/mopidy/core/__init__.py
+++ b/mopidy/core/__init__.py
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
 
 # flake8: noqa
 from .actor import Core
-from .history import History
+from .history import HistoryController
 from .library import LibraryController
 from .listener import CoreListener
 from .playback import PlaybackController, PlaybackState
diff --git a/mopidy/core/actor.py b/mopidy/core/actor.py
index 46f94d00..edf13679 100644
--- a/mopidy/core/actor.py
+++ b/mopidy/core/actor.py
@@ -7,7 +7,7 @@ import pykka
 
 from mopidy import audio, backend, mixer
 from mopidy.audio import PlaybackState
-from mopidy.core.history import History
+from mopidy.core.history import HistoryController
 from mopidy.core.library import LibraryController
 from mopidy.core.listener import CoreListener
 from mopidy.core.playback import PlaybackController
@@ -25,8 +25,8 @@ class Core(
     :class:`mopidy.core.LibraryController`."""
 
     history = None
-    """The playback history. An instance of
-    :class:`mopidy.core.TrackHistory`"""
+    """The playback history controller. An instance of
+    :class:`mopidy.core.HistoryController`."""
 
     playback = None
     """The playback controller. An instance of
@@ -47,7 +47,7 @@ class Core(
 
         self.library = LibraryController(backends=self.backends, core=self)
 
-        self.history = History()
+        self.history = HistoryController()
 
         self.playback = PlaybackController(
             mixer=mixer, backends=self.backends, core=self)
diff --git a/mopidy/core/history.py b/mopidy/core/history.py
index 24b808d2..38ebe74d 100644
--- a/mopidy/core/history.py
+++ b/mopidy/core/history.py
@@ -10,7 +10,7 @@ from mopidy.models import Ref, Track
 logger = logging.getLogger(__name__)
 
 
-class History(object):
+class HistoryController(object):
     track_list = []
 
     def add(self, track):
diff --git a/tests/core/test_history.py b/tests/core/test_history.py
index 7b681d83..3592274c 100644
--- a/tests/core/test_history.py
+++ b/tests/core/test_history.py
@@ -2,11 +2,12 @@ from __future__ import unicode_literals
 
 import unittest
 
-from mopidy.core import History
+from mopidy.core import HistoryController
 from mopidy.models import Artist, Track
 
 
 class PlaybackHistoryTest(unittest.TestCase):
+
     def setUp(self):
         self.tracks = [
             Track(uri='dummy1:a', name='foo',
@@ -14,7 +15,7 @@ class PlaybackHistoryTest(unittest.TestCase):
             Track(uri='dummy2:a', name='foo'),
             Track(uri='dummy3:a', name='bar')
         ]
-        self.history = History()
+        self.history = HistoryController()
 
     def test_add_track(self):
         self.history.add(self.tracks[0])