Simplify pykka imports

mopidy/audio/actor.py

@@ -5,7 +5,7 @@ import gobject
 
 import logging
 
-from pykka.actor import ThreadingActor
+import pykka
 
 from mopidy import settings
 from mopidy.utils import process
@@ -18,7 +18,7 @@ logger = logging.getLogger('mopidy.audio')
 mixers.register_mixers()
 
 
-class Audio(ThreadingActor):
+class Audio(pykka.ThreadingActor):
     """
     Audio output through `GStreamer <http://gstreamer.freedesktop.org/>`_.
 

mopidy/audio/listener.py

@@ -1,4 +1,4 @@
-from pykka.registry import ActorRegistry
+import pykka
 
 
 class AudioListener(object):
@@ -15,7 +15,7 @@ class AudioListener(object):
     @staticmethod
     def send(event, **kwargs):
         """Helper to allow calling of audio listener events"""
-        listeners = ActorRegistry.get_by_class(AudioListener)
+        listeners = pykka.ActorRegistry.get_by_class(AudioListener)
         for listener in listeners:
             getattr(listener.proxy(), event)(**kwargs)
 

mopidy/audio/mixers/nad.py

@@ -10,7 +10,7 @@ try:
 except ImportError:
     serial = None  # noqa
 
-from pykka.actor import ThreadingActor
+import pykka
 
 from . import utils
 
@@ -74,7 +74,7 @@ class NadMixer(gst.Element, gst.ImplementsInterface, gst.interfaces.Mixer):
         ).proxy()
 
 
-class NadTalker(ThreadingActor):
+class NadTalker(pykka.ThreadingActor):
     """
     Independent thread which does the communication with the NAD amplifier
 

mopidy/backends/dummy.py

@@ -1,10 +1,10 @@
-from pykka.actor import ThreadingActor
+import pykka
 
 from mopidy.backends import base
 from mopidy.models import Playlist
 
 
-class DummyBackend(ThreadingActor, base.Backend):
+class DummyBackend(pykka.ThreadingActor, base.Backend):
     """
     A backend which implements the backend API in the simplest way possible.
     Used in tests of the frontends.

mopidy/backends/local/actor.py

@@ -1,6 +1,6 @@
 import logging
 
-from pykka.actor import ThreadingActor
+import pykka
 
 from mopidy.backends import base
 
@@ -10,7 +10,7 @@ from .stored_playlists import LocalStoredPlaylistsProvider
 logger = logging.getLogger(u'mopidy.backends.local')
 
 
-class LocalBackend(ThreadingActor, base.Backend):
+class LocalBackend(pykka.ThreadingActor, base.Backend):
     """
     A backend for playing music from a local music archive.
 

mopidy/backends/spotify/actor.py

@@ -1,6 +1,6 @@
 import logging
 
-from pykka.actor import ThreadingActor
+import pykka
 
 from mopidy import settings
 from mopidy.backends import base
@@ -8,7 +8,7 @@ from mopidy.backends import base
 logger = logging.getLogger('mopidy.backends.spotify')
 
 
-class SpotifyBackend(ThreadingActor, base.Backend):
+class SpotifyBackend(pykka.ThreadingActor, base.Backend):
     """
     A backend for playing music from the `Spotify <http://www.spotify.com/>`_
     music streaming service. The backend uses the official `libspotify

mopidy/core/actor.py

@@ -1,4 +1,4 @@
-from pykka.actor import ThreadingActor
+import pykka
 
 from mopidy.audio import AudioListener
 
@@ -8,7 +8,7 @@ from .playback import PlaybackController
 from .stored_playlists import StoredPlaylistsController
 
 
-class Core(ThreadingActor, AudioListener):
+class Core(pykka.ThreadingActor, AudioListener):
     #: The current playlist controller. An instance of
     #: :class:`mopidy.core.CurrentPlaylistController`.
     current_playlist = None

mopidy/core/listener.py

@@ -1,4 +1,4 @@
-from pykka.registry import ActorRegistry
+import pykka
 
 
 class CoreListener(object):
@@ -15,7 +15,7 @@ class CoreListener(object):
     @staticmethod
     def send(event, **kwargs):
         """Helper to allow calling of core listener events"""
-        listeners = ActorRegistry.get_by_class(CoreListener)
+        listeners = pykka.ActorRegistry.get_by_class(CoreListener)
         for listener in listeners:
             getattr(listener.proxy(), event)(**kwargs)
 

mopidy/frontends/lastfm.py

@@ -1,7 +1,7 @@
 import logging
 import time
 
-from pykka.actor import ThreadingActor
+import pykka
 
 from mopidy import exceptions, settings
 from mopidy.core import CoreListener
@@ -17,7 +17,7 @@ API_KEY = '2236babefa8ebb3d93ea467560d00d04'
 API_SECRET = '94d9a09c0cd5be955c4afaeaffcaefcd'
 
 
-class LastfmFrontend(ThreadingActor, CoreListener):
+class LastfmFrontend(pykka.ThreadingActor, CoreListener):
     """
     Frontend which scrobbles the music you play to your `Last.fm
     <http://www.last.fm>`_ profile.

mopidy/frontends/mpd/actor.py

@@ -1,7 +1,7 @@
 import logging
 import sys
 
-from pykka import registry, actor
+import pykka
 
 from mopidy import settings
 from mopidy.core import CoreListener
@@ -11,7 +11,7 @@ from mopidy.utils import encoding, network, process
 logger = logging.getLogger('mopidy.frontends.mpd')
 
 
-class MpdFrontend(actor.ThreadingActor, CoreListener):
+class MpdFrontend(pykka.ThreadingActor, CoreListener):
     """
     The MPD frontend.
 
@@ -50,7 +50,7 @@ class MpdFrontend(actor.ThreadingActor, CoreListener):
     def send_idle(self, subsystem):
         # FIXME this should be updated once pykka supports non-blocking calls
         # on proxies or some similar solution
-        registry.ActorRegistry.broadcast({
+        pykka.ActorRegistry.broadcast({
             'command': 'pykka_call',
             'attr_path': ('on_idle',),
             'args': [subsystem],

mopidy/frontends/mpd/dispatcher.py

@@ -1,7 +1,7 @@
 import logging
 import re
 
-from pykka import ActorDeadError
+import pykka
 
 from mopidy import settings
 from mopidy.frontends.mpd import exceptions, protocol
@@ -156,7 +156,7 @@ class MpdDispatcher(object):
         try:
             response = self._format_response(self._call_handler(request))
             return self._call_next_filter(request, response, filter_chain)
-        except ActorDeadError as e:
+        except pykka.ActorDeadError as e:
             logger.warning(u'Tried to communicate with dead actor.')
             raise exceptions.MpdSystemError(e)
 

mopidy/frontends/mpd/protocol/status.py

@@ -1,4 +1,4 @@
-import pykka.future
+import pykka
 
 from mopidy.core import PlaybackState
 from mopidy.frontends.mpd.exceptions import MpdNotImplemented
@@ -186,7 +186,7 @@ def status(context):
             context.core.playback.current_playlist_position),
         'playback.time_position': context.core.playback.time_position,
     }
-    pykka.future.get_all(futures.values())
+    pykka.get_all(futures.values())
     result = [
         ('volume', _status_volume(futures)),
         ('repeat', _status_repeat(futures)),

mopidy/frontends/mpris/actor.py

@@ -1,6 +1,6 @@
 import logging
 
-from pykka.actor import ThreadingActor
+import pykka
 
 from mopidy import settings
 from mopidy.core import CoreListener
@@ -15,7 +15,7 @@ except ImportError as import_error:
     logger.debug(u'Startup notification will not be sent (%s)', import_error)
 
 
-class MprisFrontend(ThreadingActor, CoreListener):
+class MprisFrontend(pykka.ThreadingActor, CoreListener):
     """
     Frontend which lets you control Mopidy through the Media Player Remote
     Interfacing Specification (`MPRIS <http://www.mpris.org/>`_) D-Bus

mopidy/utils/network.py

@@ -5,9 +5,7 @@ import re
 import socket
 import threading
 
-from pykka import ActorDeadError
+import pykka
-from pykka.actor import ThreadingActor
-from pykka.registry import ActorRegistry
 
 from mopidy.utils import encoding
 
@@ -105,7 +103,7 @@ class Server(object):
                 self.number_of_connections() >= self.max_connections)
 
     def number_of_connections(self):
-        return len(ActorRegistry.get_by_class(self.protocol))
+        return len(pykka.ActorRegistry.get_by_class(self.protocol))
 
     def reject_connection(self, sock, addr):
         # FIXME provide more context in logging?
@@ -164,7 +162,7 @@ class Connection(object):
 
         try:
             self.actor_ref.stop(block=False)
-        except ActorDeadError:
+        except pykka.ActorDeadError:
             pass
 
         self.disable_timeout()
@@ -266,7 +264,7 @@ class Connection(object):
 
         try:
             self.actor_ref.tell({'received': data})
-        except ActorDeadError:
+        except pykka.ActorDeadError:
             self.stop(u'Actor is dead.')
 
         return True
@@ -295,7 +293,7 @@ class Connection(object):
         return False
 
 
-class LineProtocol(ThreadingActor):
+class LineProtocol(pykka.ThreadingActor):
     """
     Base class for handling line based protocols.
 

tests/backends/base/current_playlist.py

@@ -1,7 +1,7 @@
 import mock
 import random
 
-from pykka.registry import ActorRegistry
+import pykka
 
 from mopidy import audio, core
 from mopidy.core import PlaybackState
@@ -23,7 +23,7 @@ class CurrentPlaylistControllerTest(object):
         assert len(self.tracks) == 3, 'Need three tracks to run tests.'
 
     def tearDown(self):
-        ActorRegistry.stop_all()
+        pykka.ActorRegistry.stop_all()
 
     def test_length(self):
         self.assertEqual(0, len(self.controller.cp_tracks))

tests/backends/base/library.py

@@ -1,4 +1,4 @@
-from pykka.registry import ActorRegistry
+import pykka
 
 from mopidy import core
 from mopidy.models import Playlist, Track, Album, Artist
@@ -27,7 +27,7 @@ class LibraryControllerTest(object):
         self.library = self.core.library
 
     def tearDown(self):
-        ActorRegistry.stop_all()
+        pykka.ActorRegistry.stop_all()
 
     def test_refresh(self):
         self.library.refresh()

tests/backends/events_test.py

@@ -1,6 +1,5 @@
 import mock
-
+import pykka
-from pykka.registry import ActorRegistry
 
 from mopidy import audio, core
 from mopidy.backends import dummy
@@ -17,7 +16,7 @@ class BackendEventsTest(unittest.TestCase):
         self.core = core.Core.start(backend=self.backend).proxy()
 
     def tearDown(self):
-        ActorRegistry.stop_all()
+        pykka.ActorRegistry.stop_all()
 
     def test_pause_sends_track_playback_paused_event(self, send):
         self.core.current_playlist.add(Track(uri='a'))

tests/frontends/mpd/dispatcher_test.py

@@ -1,4 +1,4 @@
-from pykka.registry import ActorRegistry
+import pykka
 
 from mopidy import core
 from mopidy.backends import dummy
@@ -16,7 +16,7 @@ class MpdDispatcherTest(unittest.TestCase):
         self.dispatcher = MpdDispatcher()
 
     def tearDown(self):
-        ActorRegistry.stop_all()
+        pykka.ActorRegistry.stop_all()
 
     def test_register_same_pattern_twice_fails(self):
         func = lambda: None

tests/frontends/mpd/protocol/__init__.py

@@ -1,6 +1,5 @@
 import mock
-
+import pykka
-from pykka.registry import ActorRegistry
 
 from mopidy import core, settings
 from mopidy.backends import dummy
@@ -32,7 +31,7 @@ class BaseTestCase(unittest.TestCase):
         self.context = self.dispatcher.context
 
     def tearDown(self):
-        ActorRegistry.stop_all()
+        pykka.ActorRegistry.stop_all()
         settings.runtime.clear()
 
     def sendRequest(self, request):

tests/frontends/mpd/status_test.py

@@ -1,4 +1,4 @@
-from pykka.registry import ActorRegistry
+import pykka
 
 from mopidy import core
 from mopidy.backends import dummy
@@ -26,7 +26,7 @@ class StatusHandlerTest(unittest.TestCase):
         self.context = self.dispatcher.context
 
     def tearDown(self):
-        ActorRegistry.stop_all()
+        pykka.ActorRegistry.stop_all()
 
     def test_stats_method(self):
         result = status.stats(self.context)

tests/frontends/mpris/player_interface_test.py

@@ -1,8 +1,7 @@
 import sys
 
 import mock
-
+import pykka
-from pykka.registry import ActorRegistry
 
 from mopidy import core, exceptions
 from mopidy.backends import dummy
@@ -30,7 +29,7 @@ class PlayerInterfaceTest(unittest.TestCase):
         self.mpris = objects.MprisObject(core=self.core)
 
     def tearDown(self):
-        ActorRegistry.stop_all()
+        pykka.ActorRegistry.stop_all()
 
     def test_get_playback_status_is_playing_when_playing(self):
         self.core.playback.state = PLAYING

tests/frontends/mpris/root_interface_test.py

@@ -1,8 +1,7 @@
 import sys
 
 import mock
-
+import pykka
-from pykka.registry import ActorRegistry
 
 from mopidy import core, exceptions, settings
 from mopidy.backends import dummy
@@ -25,7 +24,7 @@ class RootInterfaceTest(unittest.TestCase):
         self.mpris = objects.MprisObject(core=self.core)
 
     def tearDown(self):
-        ActorRegistry.stop_all()
+        pykka.ActorRegistry.stop_all()
 
     def test_constructor_connects_to_dbus(self):
         self.assert_(self.mpris._connect_to_dbus.called)