From 485e1eb1e53039a6fb8818ad965fb7ec26aac582 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Wed, 11 Aug 2010 19:52:32 +0200
Subject: [PATCH] Rename mopidy.process.BaseProcess.{_run => run_inside_try}

---
 mopidy/mixers/nad.py        | 2 +-
 mopidy/outputs/gstreamer.py | 5 +++--
 mopidy/process.py           | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/mopidy/mixers/nad.py b/mopidy/mixers/nad.py
index 1f7f4710..56958005 100644
--- a/mopidy/mixers/nad.py
+++ b/mopidy/mixers/nad.py
@@ -83,7 +83,7 @@ class NadTalker(BaseProcess):
         self.pipe = pipe
         self._device = None
 
-    def _run(self):
+    def run_inside_try(self):
         self._open_connection()
         self._set_device_to_known_state()
         while self.pipe.poll(None):
diff --git a/mopidy/outputs/gstreamer.py b/mopidy/outputs/gstreamer.py
index 16dd2f16..49c9d5af 100644
--- a/mopidy/outputs/gstreamer.py
+++ b/mopidy/outputs/gstreamer.py
@@ -40,7 +40,7 @@ class GStreamerProcess(BaseProcess):
         self.gst_volume = None
         self.gst_sink = None
 
-    def _run(self):
+    def run_inside_try(self):
         self.setup()
         while True:
             message = self.core_queue.get()
@@ -133,7 +133,8 @@ class GStreamerProcess(BaseProcess):
         :type state_name: string
         :rtype: :class:`True` or :class:`False`
         """
-        result = self.gst_uri_src.set_state(getattr(gst, 'STATE_' + state_name)
+        result = self.gst_uri_src.set_state(
+            getattr(gst, 'STATE_' + state_name))
         if result == gst.STATE_CHANGE_SUCCESS:
             logger.debug('Setting GStreamer state to %s: OK', state_name)
             return True
diff --git a/mopidy/process.py b/mopidy/process.py
index 4a4fa1ae..8f11f3a8 100644
--- a/mopidy/process.py
+++ b/mopidy/process.py
@@ -21,7 +21,7 @@ def unpickle_connection(pickled_connection):
 class BaseProcess(multiprocessing.Process):
     def run(self):
         try:
-            self._run()
+            self.run_inside_try()
         except KeyboardInterrupt:
             logger.info(u'Interrupted by user')
             sys.exit(0)
@@ -29,7 +29,7 @@ class BaseProcess(multiprocessing.Process):
             logger.error(e.message)
             sys.exit(1)
 
-    def _run(self):
+    def run_inside_try(self):
         raise NotImplementedError
 
 
@@ -40,7 +40,7 @@ class CoreProcess(BaseProcess):
         self._backend = None
         self._frontend = None
 
-    def _run(self):
+    def run_inside_try(self):
         self._setup()
         while True:
             message = self.core_queue.get()