From 3a1de6578df2c93222abdf0bc4ded3af8a724946 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Mon, 7 Mar 2011 21:37:55 +0100
Subject: [PATCH] Remove unused BaseProcess and strip queue stuff from
 BaseThread

---
 mopidy/utils/process.py | 53 +++--------------------------------------
 1 file changed, 3 insertions(+), 50 deletions(-)

diff --git a/mopidy/utils/process.py b/mopidy/utils/process.py
index 11dafa8a..7a5ba62f 100644
--- a/mopidy/utils/process.py
+++ b/mopidy/utils/process.py
@@ -1,8 +1,5 @@
 import logging
-import multiprocessing
 import multiprocessing.dummy
-from multiprocessing.reduction import reduce_connection
-import pickle
 
 import gobject
 gobject.threads_init()
@@ -11,52 +8,10 @@ from mopidy import SettingsError
 
 logger = logging.getLogger('mopidy.utils.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 __init__(self, core_queue):
-        super(BaseProcess, self).__init__()
-        self.core_queue = core_queue
-
-    def run(self):
-        logger.debug(u'%s: Starting process', self.name)
-        try:
-            self.run_inside_try()
-        except KeyboardInterrupt:
-            logger.info(u'Interrupted by user')
-            self.exit(0, u'Interrupted by user')
-        except SettingsError as e:
-            logger.error(e.message)
-            self.exit(1, u'Settings error')
-        except ImportError as e:
-            logger.error(e)
-            self.exit(2, u'Import error')
-        except Exception as e:
-            logger.exception(e)
-            self.exit(3, u'Unknown error')
-
-    def run_inside_try(self):
-        raise NotImplementedError
-
-    def destroy(self):
-        self.terminate()
-
-    def exit(self, status=0, reason=None):
-        self.core_queue.put({'to': 'core', 'command': 'exit',
-            'status': status, 'reason': reason})
-        self.destroy()
-
 
 class BaseThread(multiprocessing.dummy.Process):
-    def __init__(self, core_queue):
+    def __init__(self):
         super(BaseThread, self).__init__()
-        self.core_queue = core_queue
         # No thread should block process from exiting
         self.daemon = True
 
@@ -84,8 +39,6 @@ class BaseThread(multiprocessing.dummy.Process):
         pass
 
     def exit(self, status=0, reason=None):
-        self.core_queue.put({'to': 'core', 'command': 'exit',
-            'status': status, 'reason': reason})
         self.destroy()
 
 
@@ -98,8 +51,8 @@ class GObjectEventThread(BaseThread):
     :mod:`mopidy.output.gstreamer`, :mod:`mopidy.frontend.mpris`, etc.
     """
 
-    def __init__(self, core_queue):
-        super(GObjectEventThread, self).__init__(core_queue)
+    def __init__(self):
+        super(GObjectEventThread, self).__init__()
         self.name = u'GObjectEventThread'
         self.loop = None