From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Sun, 19 Jun 2011 01:14:51 +0000 (-0500)
Subject: ./bin/gmg commands upgraded to work with the new setup.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=72c3ae046a1bb2644c7f0eaaf138f75c4697555f;p=mediagoblin.git

./bin/gmg commands upgraded to work with the new setup.
---

diff --git a/mediagoblin/gmg_commands/migrate.py b/mediagoblin/gmg_commands/migrate.py
index 3ce25701..9e01d51c 100644
--- a/mediagoblin/gmg_commands/migrate.py
+++ b/mediagoblin/gmg_commands/migrate.py
@@ -23,9 +23,6 @@ def migrate_parser_setup(subparser):
     subparser.add_argument(
         '-cf', '--conf_file', default='mediagoblin.ini',
         help="Config file used to set up environment")
-    subparser.add_argument(
-        '-cs', '--app_section', default='app:mediagoblin',
-        help="Section of the config file where the app config is stored.")
 
 
 def migrate(args):
diff --git a/mediagoblin/gmg_commands/shell.py b/mediagoblin/gmg_commands/shell.py
index 16caf398..dc1621d1 100644
--- a/mediagoblin/gmg_commands/shell.py
+++ b/mediagoblin/gmg_commands/shell.py
@@ -25,9 +25,6 @@ def shell_parser_setup(subparser):
     subparser.add_argument(
         '-cf', '--conf_file', default='mediagoblin.ini',
         help="Config file used to set up environment")
-    subparser.add_argument(
-        '-cs', '--app_section', default='app:mediagoblin',
-        help="Section of the config file where the app config is stored.")
 
 
 SHELL_BANNER = """\
diff --git a/mediagoblin/gmg_commands/util.py b/mediagoblin/gmg_commands/util.py
index 41a21a1e..8dcac913 100644
--- a/mediagoblin/gmg_commands/util.py
+++ b/mediagoblin/gmg_commands/util.py
@@ -15,10 +15,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-import os
-
-from paste.deploy.loadwsgi import NicerConfigParser
-
 from mediagoblin import app
 
 
@@ -26,20 +22,6 @@ def setup_app(args):
     """
     Setup the application after reading the mediagoblin config files
     """
-    # 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 = app.MediaGoblinApp(args.conf_file)
 
     return mgoblin_app