From 3a184f9ddd55816b1c9d3bfa72b429d1e8ecbf77 Mon Sep 17 00:00:00 2001
From: nathanharper <nathan.sam.harper@gmail.com>
Date: Wed, 22 Jan 2014 04:30:27 -0500
Subject: [PATCH] decouple mpd.protocol module from config structure

removed reference to password from protocol,
moved it to Context class.
---
 mopidy/mpd/dispatcher.py          | 7 ++++---
 mopidy/mpd/protocol/connection.py | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/mopidy/mpd/dispatcher.py b/mopidy/mpd/dispatcher.py
index 6aeace9d..0a916408 100644
--- a/mopidy/mpd/dispatcher.py
+++ b/mopidy/mpd/dispatcher.py
@@ -229,8 +229,8 @@ class MpdContext(object):
     #: The current :class:`mopidy.mpd.MpdSession`.
     session = None
 
-    #: The Mopidy configuration.
-    config = None
+    #: The MPD password
+    password = None
 
     #: The Mopidy core API. An instance of :class:`mopidy.core.Core`.
     core = None
@@ -246,7 +246,8 @@ class MpdContext(object):
     def __init__(self, dispatcher, session=None, config=None, core=None):
         self.dispatcher = dispatcher
         self.session = session
-        self.config = config
+        if config is not None:
+            self.password = config['mpd']['password']
         self.core = core
         self.events = set()
         self.subscriptions = set()
diff --git a/mopidy/mpd/protocol/connection.py b/mopidy/mpd/protocol/connection.py
index a6f9ffcb..41ee9e6a 100644
--- a/mopidy/mpd/protocol/connection.py
+++ b/mopidy/mpd/protocol/connection.py
@@ -39,7 +39,7 @@ def password(context, password):
         This is used for authentication with the server. ``PASSWORD`` is
         simply the plaintext password.
     """
-    if password == context.config['mpd']['password']:
+    if password == context.password:
         context.dispatcher.authenticated = True
     else:
         raise MpdPasswordError('incorrect password')