From b591a276280faa86deeace513780cbfca1b89351 Mon Sep 17 00:00:00 2001 From: Max Goodman Date: Sun, 9 Sep 2012 02:48:09 -0700 Subject: [PATCH] plugins: Load plugins in the order listed in the .ini. --- r2/r2/lib/plugin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/r2/r2/lib/plugin.py b/r2/r2/lib/plugin.py index 2fbcf21c9..f09ac32fd 100644 --- a/r2/r2/lib/plugin.py +++ b/r2/r2/lib/plugin.py @@ -23,6 +23,7 @@ import sys import os.path import pkg_resources +from collections import OrderedDict from pylons import config @@ -77,8 +78,6 @@ class Plugin(object): class PluginLoader(object): def __init__(self, plugin_names=None): - self.plugins = {} - if plugin_names is None: entry_points = self.available_plugins() else: @@ -93,6 +92,7 @@ class PluginLoader(object): else: entry_points.append(entry_point) + self.plugins = OrderedDict() for entry_point in entry_points: plugin_cls = entry_point.load() self.plugins[entry_point.name] = plugin_cls(entry_point)