./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 3ce25701276af2af6802d0806a4b78e87011af49..9e01d51c63ced38f2a990817345ae068a4e25ade 100644 (file)
--- 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 16caf3980c054c3810a064eeaf54984fa80d1f0e..dc1621d1f62a800d1c0a2fec1d9ab012d48a1511 100644 (file)
--- 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 41a21a1e71934db45ce93fab12b0df057a80510d..8dcac913f0db519c27b2675bbbdc44ff5bca5ded 100644 (file)
--- 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