diff options
| author | cfdv <caldavis@gmail.com> | 2011-06-19 17:39:32 -0500 |
|---|---|---|
| committer | cfdv <caldavis@gmail.com> | 2011-06-19 17:39:32 -0500 |
| commit | 0e66e6a6c6e60b8cc7c4ab1fc0c443c5b8234ada (patch) | |
| tree | 7a0936a9a83f9f39a090f96e41a274ac77ddaee4 /mediagoblin/gmg_commands | |
| parent | e8fda91bc2326911ea9a0197e595bc333540c282 (diff) | |
| parent | 188240e312b8c5ff50bef276c97b36e5b3835f1e (diff) | |
| download | mediagoblin-0e66e6a6c6e60b8cc7c4ab1fc0c443c5b8234ada.tar.lz mediagoblin-0e66e6a6c6e60b8cc7c4ab1fc0c443c5b8234ada.tar.xz mediagoblin-0e66e6a6c6e60b8cc7c4ab1fc0c443c5b8234ada.zip | |
Merge branch 'is330', remote-tracking branch 'origin/master' into is330
Diffstat (limited to 'mediagoblin/gmg_commands')
| -rw-r--r-- | mediagoblin/gmg_commands/migrate.py | 3 | ||||
| -rw-r--r-- | mediagoblin/gmg_commands/shell.py | 3 | ||||
| -rw-r--r-- | mediagoblin/gmg_commands/util.py | 20 |
3 files changed, 1 insertions, 25 deletions
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 |