diff options
| author | Jef van Schendel <jefvanschendel@gmail.com> | 2011-06-20 16:33:14 +0200 |
|---|---|---|
| committer | Jef van Schendel <jefvanschendel@gmail.com> | 2011-06-20 16:33:14 +0200 |
| commit | 2d1f91cc41aca908502ea1d18687b902a5fd90a1 (patch) | |
| tree | 1d6d425a8ec7a7bfb8490c88d87806d856336d1e /mediagoblin/gmg_commands/util.py | |
| parent | 76e21adbd8756159d83bef99b335398519b338f3 (diff) | |
| parent | 5c441e75ebc4ad63c3a5362d9bc451abe97984d2 (diff) | |
| download | mediagoblin-2d1f91cc41aca908502ea1d18687b902a5fd90a1.tar.lz mediagoblin-2d1f91cc41aca908502ea1d18687b902a5fd90a1.tar.xz mediagoblin-2d1f91cc41aca908502ea1d18687b902a5fd90a1.zip | |
Merge remote-tracking branch 'gitorious/master'
Diffstat (limited to 'mediagoblin/gmg_commands/util.py')
| -rw-r--r-- | mediagoblin/gmg_commands/util.py | 20 |
1 files changed, 1 insertions, 19 deletions
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 |