From 587dde287faa44c681b11fa86bf4a4fa8cb5c17d Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Fri, 26 Oct 2012 22:32:06 +0200
Subject: [PATCH] Update to work with Pykka 1.0

---
 docs/changes.rst                       | 2 +-
 mopidy/__main__.py                     | 2 +-
 mopidy/backends/dummy.py               | 2 ++
 mopidy/backends/local/actor.py         | 2 ++
 mopidy/backends/spotify/actor.py       | 2 ++
 mopidy/core/actor.py                   | 2 ++
 mopidy/utils/network.py                | 2 +-
 tests/utils/network/connection_test.py | 4 ++--
 8 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/docs/changes.rst b/docs/changes.rst
index 854c90d3..c68db685 100644
--- a/docs/changes.rst
+++ b/docs/changes.rst
@@ -10,7 +10,7 @@ v0.9.0 (in development)
 
 **Dependencies**
 
-- Pykka >= 0.16 is now required.
+- Pykka >= 1.0 is now required.
 
 **Bug fixes**
 
diff --git a/mopidy/__main__.py b/mopidy/__main__.py
index 97c2a010..67fefde6 100644
--- a/mopidy/__main__.py
+++ b/mopidy/__main__.py
@@ -74,7 +74,7 @@ def main():
 
 
 def check_dependencies():
-    pykka_required = '0.16'
+    pykka_required = '1.0'
     if StrictVersion(pykka.__version__) < StrictVersion(pykka_required):
         sys.exit(
             u'Mopidy requires Pykka >= %s, but found %s' %
diff --git a/mopidy/backends/dummy.py b/mopidy/backends/dummy.py
index 6c3e1437..bb5aaf73 100644
--- a/mopidy/backends/dummy.py
+++ b/mopidy/backends/dummy.py
@@ -13,6 +13,8 @@ class DummyBackend(ThreadingActor, base.Backend):
     """
 
     def __init__(self, audio):
+        super(DummyBackend, self).__init__()
+
         self.library = DummyLibraryProvider(backend=self)
         self.playback = DummyPlaybackProvider(audio=audio, backend=self)
         self.stored_playlists = DummyStoredPlaylistsProvider(backend=self)
diff --git a/mopidy/backends/local/actor.py b/mopidy/backends/local/actor.py
index fe31a5fc..1046aaf4 100644
--- a/mopidy/backends/local/actor.py
+++ b/mopidy/backends/local/actor.py
@@ -26,6 +26,8 @@ class LocalBackend(ThreadingActor, base.Backend):
     """
 
     def __init__(self, audio):
+        super(LocalBackend, self).__init__()
+
         self.library = LocalLibraryProvider(backend=self)
         self.playback = base.BasePlaybackProvider(audio=audio, backend=self)
         self.stored_playlists = LocalStoredPlaylistsProvider(backend=self)
diff --git a/mopidy/backends/spotify/actor.py b/mopidy/backends/spotify/actor.py
index 186f5729..3c897380 100644
--- a/mopidy/backends/spotify/actor.py
+++ b/mopidy/backends/spotify/actor.py
@@ -41,6 +41,8 @@ class SpotifyBackend(ThreadingActor, base.Backend):
     # missing spotify dependencies.
 
     def __init__(self, audio):
+        super(SpotifyBackend, self).__init__()
+
         from .library import SpotifyLibraryProvider
         from .playback import SpotifyPlaybackProvider
         from .session_manager import SpotifySessionManager
diff --git a/mopidy/core/actor.py b/mopidy/core/actor.py
index aded0774..806caca2 100644
--- a/mopidy/core/actor.py
+++ b/mopidy/core/actor.py
@@ -26,6 +26,8 @@ class Core(ThreadingActor, AudioListener):
     stored_playlists = None
 
     def __init__(self, audio=None, backend=None):
+        super(Core, self).__init__()
+
         self._backend = backend
 
         self.current_playlist = CurrentPlaylistController(core=self)
diff --git a/mopidy/utils/network.py b/mopidy/utils/network.py
index b8914614..a6032f37 100644
--- a/mopidy/utils/network.py
+++ b/mopidy/utils/network.py
@@ -265,7 +265,7 @@ class Connection(object):
             return True
 
         try:
-            self.actor_ref.send_one_way({'received': data})
+            self.actor_ref.tell({'received': data})
         except ActorDeadError:
             self.stop(u'Actor is dead.')
 
diff --git a/tests/utils/network/connection_test.py b/tests/utils/network/connection_test.py
index c51957f1..c9fe9a05 100644
--- a/tests/utils/network/connection_test.py
+++ b/tests/utils/network/connection_test.py
@@ -392,14 +392,14 @@ class ConnectionTest(unittest.TestCase):
 
         self.assertTrue(network.Connection.recv_callback(
             self.mock, sentinel.fd, gobject.IO_IN))
-        self.mock.actor_ref.send_one_way.assert_called_once_with(
+        self.mock.actor_ref.tell.assert_called_once_with(
             {'received': 'data'})
 
     def test_recv_callback_handles_dead_actors(self):
         self.mock.sock = Mock(spec=socket.SocketType)
         self.mock.sock.recv.return_value = 'data'
         self.mock.actor_ref = Mock()
-        self.mock.actor_ref.send_one_way.side_effect = pykka.ActorDeadError()
+        self.mock.actor_ref.tell.side_effect = pykka.ActorDeadError()
 
         self.assertTrue(network.Connection.recv_callback(
             self.mock, sentinel.fd, gobject.IO_IN))