From 660a1b738290afa45d9c2f0fbcabf0b171e34b9d Mon Sep 17 00:00:00 2001
From: Thomas Adamcik <thomas@adamcik.no>
Date: Mon, 11 Nov 2013 22:32:46 +0100
Subject: [PATCH] avahi: Remove use of config_section

---
 mopidy/frontends/http/actor.py | 12 +++++++-----
 mopidy/frontends/mpd/actor.py  | 14 +++++++-------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/mopidy/frontends/http/actor.py b/mopidy/frontends/http/actor.py
index 3e46dc63..4e3493d4 100644
--- a/mopidy/frontends/http/actor.py
+++ b/mopidy/frontends/http/actor.py
@@ -23,16 +23,18 @@ class HttpFrontend(pykka.ThreadingActor, CoreListener):
         super(HttpFrontend, self).__init__()
         self.config = config
         self.core = core
+
+        self.hostname = config['http']['hostname']
+        self.port = config['http']['port']
+        self.zeroconf_name = config['http']['zeroconf']
         self.zeroconf_service = None
+
         self._setup_server()
         self._setup_websocket_plugin()
         app = self._create_app()
         self._setup_logging(app)
 
     def _setup_server(self):
-        self.config_section = self.config['http']
-        self.hostname = self.config_section['hostname']
-        self.port = self.config_section['port']
         cherrypy.config.update({
             'engine.autoreload_on': False,
             'server.socket_host': self.hostname,
@@ -93,9 +95,9 @@ class HttpFrontend(pykka.ThreadingActor, CoreListener):
         cherrypy.engine.start()
         logger.info('HTTP server running at %s', cherrypy.server.base())
 
-        if self.config_section['zeroconf']:
+        if self.zeroconf_name:
             self.zeroconf_service = zeroconf.Zeroconf(
-                stype='_http._tcp', name=self.config_section['zeroconf'],
+                stype='_http._tcp', name=self.zeroconf_name,
                 host=self.hostname, port=self.port)
 
             if self.zeroconf_service.publish():
diff --git a/mopidy/frontends/mpd/actor.py b/mopidy/frontends/mpd/actor.py
index 87c1a571..9df7ba07 100644
--- a/mopidy/frontends/mpd/actor.py
+++ b/mopidy/frontends/mpd/actor.py
@@ -15,16 +15,16 @@ logger = logging.getLogger('mopidy.frontends.mpd')
 class MpdFrontend(pykka.ThreadingActor, CoreListener):
     def __init__(self, config, core):
         super(MpdFrontend, self).__init__()
+
         hostname = network.format_hostname(config['mpd']['hostname'])
-        port = config['mpd']['port']
-        self.config_section = config['mpd']
         self.hostname = hostname
-        self.port = port
+        self.port = config['mpd']['port']
+        self.zeroconf_name = config['mpd']['zeroconf']
         self.zeroconf_service = None
 
         try:
             network.Server(
-                hostname, port,
+                self.hostname, self.port,
                 protocol=session.MpdSession,
                 protocol_kwargs={
                     'config': config,
@@ -38,12 +38,12 @@ class MpdFrontend(pykka.ThreadingActor, CoreListener):
                 encoding.locale_decode(error))
             sys.exit(1)
 
-        logger.info('MPD server running at [%s]:%s', hostname, port)
+        logger.info('MPD server running at [%s]:%s', self.hostname, self.port)
 
     def on_start(self):
-        if self.config_section['zeroconf']:
+        if self.zeroconf_name:
             self.zeroconf_service = zeroconf.Zeroconf(
-                stype='_mpd._tcp', name=self.config_section['zeroconf'],
+                stype='_mpd._tcp', name=self.zeroconf_name,
                 host=self.hostname, port=self.port)
 
             if self.zeroconf_service.publish():