From a301906fe710bf4b5dba32879b02a4ba0ae197d1 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Mon, 29 Apr 2013 22:52:11 +0200
Subject: [PATCH] commands: Move --show-{config,deps} handlers to new module

---
 mopidy/__main__.py   | 30 ++++--------------------------
 mopidy/commands.py   | 35 +++++++++++++++++++++++++++++++++++
 mopidy/utils/deps.py |  7 -------
 3 files changed, 39 insertions(+), 33 deletions(-)
 create mode 100644 mopidy/commands.py

diff --git a/mopidy/__main__.py b/mopidy/__main__.py
index 26a02094..1f9b185c 100644
--- a/mopidy/__main__.py
+++ b/mopidy/__main__.py
@@ -24,11 +24,11 @@ sys.path.insert(
     0, os.path.abspath(os.path.join(os.path.dirname(__file__), '../')))
 
 
-from mopidy import ext
+from mopidy import commands, ext
 from mopidy.audio import Audio
 from mopidy import config as config_lib
 from mopidy.core import Core
-from mopidy.utils import deps, log, path, process, versioning
+from mopidy.utils import log, path, process, versioning
 
 logger = logging.getLogger('mopidy.main')
 
@@ -39,9 +39,9 @@ def main():
 
     args = parse_args()
     if args.show_config:
-        show_config_task(args)
+        commands.show_config(args)
     if args.show_deps:
-        deps.show_deps_task()
+        commands.show_deps()
 
     config_files = args.config.split(b':')
     config_overrides = args.overrides
@@ -173,28 +173,6 @@ def parse_args():
     return parser.parse_args(args=mopidy_args)
 
 
-def show_config_task(args):
-    files = vars(args).get('config', b'').split(b':')
-    overrides = vars(args).get('overrides', [])
-
-    extensions = ext.load_extensions()
-    config, errors = config_lib.load(files, extensions, overrides)
-
-    # Clear out any config for disabled extensions.
-    for extension in extensions:
-        if not ext.validate_extension(extension):
-            config[extension.ext_name] = {b'enabled': False}
-            errors[extension.ext_name] = {
-                b'enabled': b'extension disabled its self.'}
-        elif not config[extension.ext_name]['enabled']:
-            config[extension.ext_name] = {b'enabled': False}
-            errors[extension.ext_name] = {
-                b'enabled': b'extension disabled by config.'}
-
-    print config_lib.format(config, extensions, errors)
-    sys.exit(0)
-
-
 def check_old_locations():
     dot_mopidy_dir = path.expand_path(b'~/.mopidy')
     if os.path.isdir(dot_mopidy_dir):
diff --git a/mopidy/commands.py b/mopidy/commands.py
new file mode 100644
index 00000000..7c21b013
--- /dev/null
+++ b/mopidy/commands.py
@@ -0,0 +1,35 @@
+from __future__ import unicode_literals
+
+import sys
+
+from mopidy import config as config_lib, ext
+from mopidy.utils import deps
+
+
+def show_config(args):
+    """Prints the effective config and exits."""
+    files = vars(args).get('config', b'').split(b':')
+    overrides = vars(args).get('overrides', [])
+
+    extensions = ext.load_extensions()
+    config, errors = config_lib.load(files, extensions, overrides)
+
+    # Clear out any config for disabled extensions.
+    for extension in extensions:
+        if not ext.validate_extension(extension):
+            config[extension.ext_name] = {b'enabled': False}
+            errors[extension.ext_name] = {
+                b'enabled': b'extension disabled its self.'}
+        elif not config[extension.ext_name]['enabled']:
+            config[extension.ext_name] = {b'enabled': False}
+            errors[extension.ext_name] = {
+                b'enabled': b'extension disabled by config.'}
+
+    print config_lib.format(config, extensions, errors)
+    sys.exit(0)
+
+
+def show_deps():
+    """Prints a list of all dependencies and exits."""
+    print deps.format_dependency_list()
+    sys.exit(0)
diff --git a/mopidy/utils/deps.py b/mopidy/utils/deps.py
index 780b0fdb..99a22d3c 100644
--- a/mopidy/utils/deps.py
+++ b/mopidy/utils/deps.py
@@ -3,7 +3,6 @@ from __future__ import unicode_literals
 import functools
 import os
 import platform
-import sys
 
 import pygst
 pygst.require('0.10')
@@ -14,12 +13,6 @@ import pkg_resources
 from . import formatting
 
 
-def show_deps_task():
-    """Prints a list of all dependencies and exits."""
-    print format_dependency_list()
-    sys.exit(0)
-
-
 def format_dependency_list(adapters=None):
     if adapters is None:
         dist_names = set([