From 047ed40ccc8bc3bdab100281fb7d4a019319da5a Mon Sep 17 00:00:00 2001
From: Thomas Adamcik <thomas@adamcik.no>
Date: Thu, 23 Jan 2014 22:28:37 +0100
Subject: [PATCH] mpd: Stop string escaping all input as we have a proper
 tokenizer

---
 mopidy/mpd/dispatcher.py | 2 ++
 mopidy/mpd/session.py    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/mopidy/mpd/dispatcher.py b/mopidy/mpd/dispatcher.py
index 5194885f..849d3821 100644
--- a/mopidy/mpd/dispatcher.py
+++ b/mopidy/mpd/dispatcher.py
@@ -182,6 +182,8 @@ class MpdDispatcher(object):
             raise
         except LookupError:
             pass  # Command has not been converted, i.e. fallback...
+
+        request = request.decode('string_escape')
         (command_name, handler, kwargs) = self._find_handler(request)
         try:
             return handler(self.context, **kwargs)
diff --git a/mopidy/mpd/session.py b/mopidy/mpd/session.py
index 2c0bd840..f0317ede 100644
--- a/mopidy/mpd/session.py
+++ b/mopidy/mpd/session.py
@@ -45,7 +45,7 @@ class MpdSession(network.LineProtocol):
 
     def decode(self, line):
         try:
-            return super(MpdSession, self).decode(line.decode('string_escape'))
+            return super(MpdSession, self).decode(line)
         except ValueError:
             logger.warning(
                 'Stopping actor due to unescaping error, data '