diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2012-07-26 10:46:52 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2012-07-26 10:46:52 -0500 |
| commit | 5e9e2deee68e3368533586fe9d6efdd6fd0d007f (patch) | |
| tree | 98480867161950c0549fb6a7d76d925190b53e9c /mediagoblin/app.py | |
| parent | 33e902e3b39d9f4b25280ccd15300eaca624e778 (diff) | |
| parent | 05d8f314c639f30a699c63e3d4f8feae9a5ba60b (diff) | |
| download | mediagoblin-5e9e2deee68e3368533586fe9d6efdd6fd0d007f.tar.lz mediagoblin-5e9e2deee68e3368533586fe9d6efdd6fd0d007f.tar.xz mediagoblin-5e9e2deee68e3368533586fe9d6efdd6fd0d007f.zip | |
Merge remote-tracking branch 'refs/remotes/willkg/plugins-infrastructure-rewrite'
Diffstat (limited to 'mediagoblin/app.py')
| -rw-r--r-- | mediagoblin/app.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mediagoblin/app.py b/mediagoblin/app.py index 9ef23ce8..51f5899a 100644 --- a/mediagoblin/app.py +++ b/mediagoblin/app.py @@ -32,7 +32,7 @@ from mediagoblin.init.plugins import setup_plugins from mediagoblin.init import (get_jinja_loader, get_staticdirector, setup_global_and_app_config, setup_workbench, setup_database, setup_storage, setup_beaker_cache) -from mediagoblin.tools.pluginapi import PluginCache +from mediagoblin.tools.pluginapi import PluginManager _log = logging.getLogger(__name__) @@ -82,14 +82,14 @@ class MediaGoblinApp(object): self.template_loader = get_jinja_loader( app_config.get('local_templates'), self.current_theme, - PluginCache().get_template_paths() + PluginManager().get_template_paths() ) # Set up storage systems self.public_store, self.queue_store = setup_storage() # set up routing - self.routing = routing.get_mapper(PluginCache().get_routes()) + self.routing = routing.get_mapper(PluginManager().get_routes()) # set up staticdirector tool self.staticdirector = get_staticdirector(app_config) |