diff --git a/docs/changes.rst b/docs/changes.rst index bea524e8..2926adf9 100644 --- a/docs/changes.rst +++ b/docs/changes.rst @@ -8,6 +8,10 @@ This change log is used to track all major changes to Mopidy. v0.8.1 (in development) ======================= +**Dependencies** + +- Pykka >= 1.0 is now required. + **Bug fixes** - :issue:`213`: Fix "streaming task paused, reason not-negotiated" errors diff --git a/docs/installation/index.rst b/docs/installation/index.rst index 66b920f8..c58ba9dd 100644 --- a/docs/installation/index.rst +++ b/docs/installation/index.rst @@ -26,7 +26,7 @@ dependencies installed. - Python >= 2.6, < 3 - - Pykka >= 0.12.3:: + - Pykka >= 1.0:: sudo pip install -U pykka diff --git a/mopidy/backends/dummy/__init__.py b/mopidy/backends/dummy/__init__.py index 3ada0052..8eb9029c 100644 --- a/mopidy/backends/dummy/__init__.py +++ b/mopidy/backends/dummy/__init__.py @@ -14,7 +14,7 @@ class DummyBackend(ThreadingActor, base.Backend): """ def __init__(self, *args, **kwargs): - super(DummyBackend, self).__init__(*args, **kwargs) + super(DummyBackend, self).__init__() self.current_playlist = core.CurrentPlaylistController(backend=self) diff --git a/mopidy/backends/local/__init__.py b/mopidy/backends/local/__init__.py index db86e56f..6488d97c 100644 --- a/mopidy/backends/local/__init__.py +++ b/mopidy/backends/local/__init__.py @@ -32,7 +32,7 @@ class LocalBackend(ThreadingActor, base.Backend): """ def __init__(self, *args, **kwargs): - super(LocalBackend, self).__init__(*args, **kwargs) + super(LocalBackend, self).__init__() self.current_playlist = core.CurrentPlaylistController(backend=self) diff --git a/mopidy/backends/spotify/__init__.py b/mopidy/backends/spotify/__init__.py index 1feb1c65..3811458d 100644 --- a/mopidy/backends/spotify/__init__.py +++ b/mopidy/backends/spotify/__init__.py @@ -47,7 +47,7 @@ class SpotifyBackend(ThreadingActor, base.Backend): from .playback import SpotifyPlaybackProvider from .stored_playlists import SpotifyStoredPlaylistsProvider - super(SpotifyBackend, self).__init__(*args, **kwargs) + super(SpotifyBackend, self).__init__() self.current_playlist = core.CurrentPlaylistController(backend=self) diff --git a/mopidy/utils/network.py b/mopidy/utils/network.py index 7d97daf8..ed81684e 100644 --- a/mopidy/utils/network.py +++ b/mopidy/utils/network.py @@ -250,7 +250,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/requirements/core.txt b/requirements/core.txt index 8f9da622..7f83e251 100644 --- a/requirements/core.txt +++ b/requirements/core.txt @@ -1 +1 @@ -Pykka >= 0.12.3 +Pykka >= 1.0 diff --git a/tests/utils/network/connection_test.py b/tests/utils/network/connection_test.py index 96ddb833..0ca86a7f 100644 --- a/tests/utils/network/connection_test.py +++ b/tests/utils/network/connection_test.py @@ -383,14 +383,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))