diff options
author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-05-10 20:19:16 -0500 |
---|---|---|
committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-05-10 20:19:16 -0500 |
commit | e39feb041b079af53af093050f97d741e40851e7 (patch) | |
tree | a41efd22c008bf5f439033228c92e61afd85355d /mediagoblin/init/config.py | |
parent | 829f5f9371b033a689067caffa91a03989006ce1 (diff) | |
parent | 94fadafe0908e497b9562f6e2689d83d07c5147d (diff) | |
download | mediagoblin-e39feb041b079af53af093050f97d741e40851e7.tar.lz mediagoblin-e39feb041b079af53af093050f97d741e40851e7.tar.xz mediagoblin-e39feb041b079af53af093050f97d741e40851e7.zip |
Merge branch 'master' into 623_context_hooks
Diffstat (limited to 'mediagoblin/init/config.py')
-rw-r--r-- | mediagoblin/init/config.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/init/config.py b/mediagoblin/init/config.py index d6fc6875..11a91cff 100644 --- a/mediagoblin/init/config.py +++ b/mediagoblin/init/config.py @@ -70,7 +70,7 @@ def read_mediagoblin_config(config_path, config_spec=CONFIG_SPEC_PATH): config_path, interpolation='ConfigParser') - plugins = config["plugins"].keys() + plugins = config.get("plugins", {}).keys() plugin_configs = {} for plugin in plugins: |