Use pykka.traversable() instead of magic attributes

mopidy/audio/actor.py

@@ -142,8 +142,6 @@ def _add(self, element):
 
 
 class SoftwareMixer:
-    pykka_traversable = True
-
     def __init__(self, mixer):
         self._mixer = mixer
         self._element = None
@@ -452,7 +450,7 @@ def __init__(self, config, mixer):
         self._signals = utils.Signals()
 
         if mixer and self._config["audio"]["mixer"] == "software":
-            self.mixer = SoftwareMixer(mixer)
+            self.mixer = pykka.traversable(SoftwareMixer(mixer))
 
     def on_start(self):
         self._thread = threading.current_thread()

mopidy/backend.py

@@ -1,5 +1,7 @@
 import logging
 
+import pykka
+
 from mopidy import listener
 
 logger = logging.getLogger(__name__)
@@ -44,9 +46,9 @@ class Backend:
     #: List of URI schemes this backend can handle.
     uri_schemes = []
 
-    # Because the providers is marked as pykka_traversible, we can't get() them
-    # from another actor, and need helper methods to check if the providers are
-    # set or None.
+    # Because the providers is marked as pykka.traversable(), we can't get()
+    # them from another actor, and need helper methods to check if the
+    # providers are set or None.
 
     def has_library(self):
         return self.library is not None
@@ -65,15 +67,14 @@ def ping(self):
         return True
 
 
+@pykka.traversable
 class LibraryProvider:
 
     """
     :param backend: backend the controller is a part of
     :type backend: :class:`mopidy.backend.Backend`
     """
 
-    pykka_traversable = True
-
     root_directory = None
     """
     :class:`mopidy.models.Ref.directory` instance with a URI and name set
@@ -149,6 +150,7 @@ def search(self, query=None, uris=None, exact=False):
         pass
 
 
+@pykka.traversable
 class PlaybackProvider:
 
     """
@@ -158,8 +160,6 @@ class PlaybackProvider:
     :type backend: :class:`mopidy.backend.Backend`
     """
 
-    pykka_traversable = True
-
     def __init__(self, audio, backend):
         self.audio = audio
         self.backend = backend
@@ -284,6 +284,7 @@ def get_time_position(self):
         return self.audio.get_position().get()
 
 
+@pykka.traversable
 class PlaylistsProvider:
 
     """
@@ -295,8 +296,6 @@ class PlaylistsProvider:
     :type backend: :class:`mopidy.backend.Backend` instance
     """
 
-    pykka_traversable = True
-
     def __init__(self, backend):
         self.backend = backend
 

mopidy/core/actor.py

@@ -52,14 +52,18 @@ def __init__(self, config=None, mixer=None, backends=None, audio=None):
 
         self.backends = Backends(backends)
 
-        self.library = LibraryController(backends=self.backends, core=self)
-        self.history = HistoryController()
-        self.mixer = MixerController(mixer=mixer)
-        self.playback = PlaybackController(
-            audio=audio, backends=self.backends, core=self
+        self.library = pykka.traversable(
+            LibraryController(backends=self.backends, core=self)
         )
-        self.playlists = PlaylistsController(backends=self.backends, core=self)
-        self.tracklist = TracklistController(core=self)
+        self.history = pykka.traversable(HistoryController())
+        self.mixer = pykka.traversable(MixerController(mixer=mixer))
+        self.playback = pykka.traversable(
+            PlaybackController(audio=audio, backends=self.backends, core=self)
+        )
+        self.playlists = pykka.traversable(
+            PlaylistsController(backends=self.backends, core=self)
+        )
+        self.tracklist = pykka.traversable(TracklistController(core=self))
 
         self.audio = audio
 

mopidy/core/history.py

@@ -9,8 +9,6 @@
 
 
 class HistoryController:
-    pykka_traversable = True
-
     def __init__(self):
         self._history = []
 

mopidy/core/library.py

@@ -31,8 +31,6 @@ def _backend_error_handling(backend, reraise=None):
 
 
 class LibraryController:
-    pykka_traversable = True
-
     def __init__(self, backends, core):
         self.backends = backends
         self.core = core

mopidy/core/mixer.py

@@ -26,8 +26,6 @@ def _mixer_error_handling(mixer):
 
 
 class MixerController:
-    pykka_traversable = True
-
     def __init__(self, mixer):
         self._mixer = mixer
 

mopidy/core/playback.py

@@ -11,8 +11,6 @@
 
 
 class PlaybackController:
-    pykka_traversable = True
-
     def __init__(self, audio, backends, core):
         # TODO: these should be internal
         self.backends = backends

mopidy/core/playlists.py

@@ -30,8 +30,6 @@ def _backend_error_handling(backend, reraise=None):
 
 
 class PlaylistsController:
-    pykka_traversable = True
-
     def __init__(self, backends, core):
         self.backends = backends
         self.core = core

mopidy/core/tracklist.py

@@ -11,8 +11,6 @@
 
 
 class TracklistController:
-    pykka_traversable = True
-
     def __init__(self, core):
         self.core = core
         self._next_tlid = 1