Update to work with Pykka 1.0

This commit is contained in:
Stein Magnus Jodal 2012-10-26 22:32:06 +02:00
parent a78492a65b
commit 587dde287f
8 changed files with 13 additions and 5 deletions

View File

@ -10,7 +10,7 @@ v0.9.0 (in development)
**Dependencies**
- Pykka >= 0.16 is now required.
- Pykka >= 1.0 is now required.
**Bug fixes**

View File

@ -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' %

View File

@ -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)

View File

@ -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)

View File

@ -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

View File

@ -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)

View File

@ -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.')

View File

@ -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))