From 8820121ad125728613477f3dec098aa2df5f47ac Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sun, 22 May 2011 09:56:33 -0500 Subject: Move the general applicaiton setup commands to a utility module --- mediagoblin/gmg_commands/shell.py | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) (limited to 'mediagoblin/gmg_commands/shell.py') diff --git a/mediagoblin/gmg_commands/shell.py b/mediagoblin/gmg_commands/shell.py index 5e70d556..9c0259de 100644 --- a/mediagoblin/gmg_commands/shell.py +++ b/mediagoblin/gmg_commands/shell.py @@ -16,12 +16,9 @@ import code -import os -from paste.deploy.loadwsgi import NicerConfigParser - -from mediagoblin import app from mediagoblin import globals as mgoblin_globals +from mediagoblin.gmg_commands import util as commands_util def shell_parser_setup(subparser): @@ -45,22 +42,9 @@ Available vars: def shell(args): """ + Setup a shell for the user """ - # Duplicated from from_celery.py, remove when we have the generic util - parser = NicerConfigParser(args.conf_file) - parser.read(args.conf_file) - parser._defaults.setdefault( - 'here', os.path.dirname(os.path.abspath(args.conf_file))) - parser._defaults.setdefault( - '__file__', os.path.abspath(args.conf_file)) - - mgoblin_section = dict(parser.items(args.app_section)) - mgoblin_conf = dict( - [(section_name, dict(parser.items(section_name))) - for section_name in parser.sections()]) - - mgoblin_app = app.paste_app_factory( - mgoblin_conf, **mgoblin_section) + mgoblin_app = commands_util.setup_app(args) code.interact( banner=SHELL_BANNER, -- cgit v1.2.3