From 5f16538f7e7f83864daf8c5b3937c012ca5a3991 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Wed, 11 Aug 2010 19:19:55 +0200
Subject: [PATCH] Move (un)pickle_connection from mopidy.{utils => process}.
 Utils should be as small as possible.

---
 mopidy/frontends/mpd/server.py |  3 ++-
 mopidy/process.py              | 13 ++++++++++++-
 mopidy/utils.py                | 10 ----------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/mopidy/frontends/mpd/server.py b/mopidy/frontends/mpd/server.py
index 57b6211f..5bdbb85a 100644
--- a/mopidy/frontends/mpd/server.py
+++ b/mopidy/frontends/mpd/server.py
@@ -8,7 +8,8 @@ import sys
 
 from mopidy import get_mpd_protocol_version, settings
 from mopidy.frontends.mpd.protocol import ENCODING, LINE_TERMINATOR
-from mopidy.utils import indent, pickle_connection
+from mopidy.process import pickle_connection
+from mopidy.utils import indent
 
 logger = logging.getLogger('mopidy.frontends.mpd.server')
 
diff --git a/mopidy/process.py b/mopidy/process.py
index d3c1d03e..4a4fa1ae 100644
--- a/mopidy/process.py
+++ b/mopidy/process.py
@@ -1,12 +1,23 @@
 import logging
 import multiprocessing
+from multiprocessing.reduction import reduce_connection
+import pickle
 import sys
 
 from mopidy import settings, SettingsError
-from mopidy.utils import get_class, unpickle_connection
+from mopidy.utils import get_class
 
 logger = logging.getLogger('mopidy.process')
 
+def pickle_connection(connection):
+    return pickle.dumps(reduce_connection(connection))
+
+def unpickle_connection(pickled_connection):
+    # From http://stackoverflow.com/questions/1446004
+    (func, args) = pickle.loads(pickled_connection)
+    return func(*args)
+
+
 class BaseProcess(multiprocessing.Process):
     def run(self):
         try:
diff --git a/mopidy/utils.py b/mopidy/utils.py
index 7eac9239..ff032b4e 100644
--- a/mopidy/utils.py
+++ b/mopidy/utils.py
@@ -1,7 +1,5 @@
 import logging
-from multiprocessing.reduction import reduce_connection
 import os
-import pickle
 import sys
 import urllib
 
@@ -54,14 +52,6 @@ def indent(string, places=4, linebreak='\n'):
         result += linebreak + ' ' * places + line
     return result
 
-def pickle_connection(connection):
-    return pickle.dumps(reduce_connection(connection))
-
-def unpickle_connection(pickled_connection):
-    # From http://stackoverflow.com/questions/1446004
-    (func, args) = pickle.loads(pickled_connection)
-    return func(*args)
-
 def parse_m3u(file_path):
     """
     Convert M3U file list of uris