From dbea615a105b1d7e86a5bed41f1f0280b50b44a7 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Wed, 17 Oct 2012 00:56:49 +0200
Subject: [PATCH] Fix shadowing of imports (#211)

---
 mopidy/frontends/lastfm.py      | 5 +++--
 mopidy/frontends/mpd/actor.py   | 5 +++--
 mopidy/frontends/mpris/actor.py | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/mopidy/frontends/lastfm.py b/mopidy/frontends/lastfm.py
index 70c6c8e4..45c2db16 100644
--- a/mopidy/frontends/lastfm.py
+++ b/mopidy/frontends/lastfm.py
@@ -3,7 +3,8 @@ import time
 
 from pykka.actor import ThreadingActor
 
-from mopidy import core, exceptions, settings
+from mopidy import exceptions, settings
+from mopidy.core import CoreListener
 
 try:
     import pylast
@@ -16,7 +17,7 @@ API_KEY = '2236babefa8ebb3d93ea467560d00d04'
 API_SECRET = '94d9a09c0cd5be955c4afaeaffcaefcd'
 
 
-class LastfmFrontend(ThreadingActor, core.CoreListener):
+class LastfmFrontend(ThreadingActor, CoreListener):
     """
     Frontend which scrobbles the music you play to your `Last.fm
     <http://www.last.fm>`_ profile.
diff --git a/mopidy/frontends/mpd/actor.py b/mopidy/frontends/mpd/actor.py
index 167fb1d6..d7a20158 100644
--- a/mopidy/frontends/mpd/actor.py
+++ b/mopidy/frontends/mpd/actor.py
@@ -3,14 +3,15 @@ import sys
 
 from pykka import registry, actor
 
-from mopidy import core, settings
+from mopidy import settings
+from mopidy.core import CoreListener
 from mopidy.frontends.mpd import session
 from mopidy.utils import encoding, network, process
 
 logger = logging.getLogger('mopidy.frontends.mpd')
 
 
-class MpdFrontend(actor.ThreadingActor, core.CoreListener):
+class MpdFrontend(actor.ThreadingActor, CoreListener):
     """
     The MPD frontend.
 
diff --git a/mopidy/frontends/mpris/actor.py b/mopidy/frontends/mpris/actor.py
index cbfb2cc9..e3199ac3 100644
--- a/mopidy/frontends/mpris/actor.py
+++ b/mopidy/frontends/mpris/actor.py
@@ -2,7 +2,8 @@ import logging
 
 from pykka.actor import ThreadingActor
 
-from mopidy import core, settings
+from mopidy import settings
+from mopidy.core import CoreListener
 from mopidy.frontends.mpris import objects
 
 logger = logging.getLogger('mopidy.frontends.mpris')
@@ -14,7 +15,7 @@ except ImportError as import_error:
     logger.debug(u'Startup notification will not be sent (%s)', import_error)
 
 
-class MprisFrontend(ThreadingActor, core.CoreListener):
+class MprisFrontend(ThreadingActor, CoreListener):
     """
     Frontend which lets you control Mopidy through the Media Player Remote
     Interfacing Specification (`MPRIS <http://www.mpris.org/>`_) D-Bus