From 1b512e08fcd6fc82ac20e7ceeee01a60f5e93d9e Mon Sep 17 00:00:00 2001 From: Anders Ingemann Date: Sun, 30 Jun 2013 23:13:50 +0200 Subject: [PATCH] Make plugin loading a little prettier --- base/manifest.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/base/manifest.py b/base/manifest.py index 89188dc..9f49da5 100644 --- a/base/manifest.py +++ b/base/manifest.py @@ -52,9 +52,9 @@ class Manifest(object): def load_plugins(self): self.loaded_plugins = [] - for modname in self.plugins.keys(): - if self.plugins[modname]['enabled']: - plugin_name = 'plugins.{module}'.format(module=modname) - plugin = __import__(plugin_name, fromlist=['plugins']) + for plugin_name, plugin_data in self.plugins.iteritems(): + if plugin_data['enabled']: + modname = 'plugins.{plugin_name}'.format(plugin_name=plugin_name) + plugin = __import__(modname, fromlist=['plugins']) log.debug('Loaded plugin %s', plugin_name) self.loaded_plugins.append(plugin)