diff options
| author | cfdv <caldavis@gmail.com> | 2011-06-19 17:20:23 -0500 |
|---|---|---|
| committer | cfdv <caldavis@gmail.com> | 2011-06-19 17:20:23 -0500 |
| commit | cd95cb6d3d6ffa403be5f2b347862929917aa1e3 (patch) | |
| tree | 07c7625b589437c927bc0eaa9ed4cdc27f9257d5 /mediagoblin/gmg_commands/util.py | |
| parent | 699b5475806c43af339d48408a7ea04ae9027c1a (diff) | |
| parent | 188240e312b8c5ff50bef276c97b36e5b3835f1e (diff) | |
| download | mediagoblin-cd95cb6d3d6ffa403be5f2b347862929917aa1e3.tar.lz mediagoblin-cd95cb6d3d6ffa403be5f2b347862929917aa1e3.tar.xz mediagoblin-cd95cb6d3d6ffa403be5f2b347862929917aa1e3.zip | |
Merge remote-tracking branch 'origin/master' into is315
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 |