From 00f738f953ce19c276e5c0dd7547f61287942669 Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Sun, 22 Aug 2010 01:00:16 +0000 Subject: [PATCH] Don't evaluate callable data returned from the plugin API svn: r15790 --- src/gen/plug/_manager.py | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/src/gen/plug/_manager.py b/src/gen/plug/_manager.py index 438be1543..77cbca2a2 100644 --- a/src/gen/plug/_manager.py +++ b/src/gen/plug/_manager.py @@ -384,14 +384,7 @@ class BasePluginManager(object): retval = [] data = None for plugin in self.__pgr.general_plugins(category): - if callable(plugin.data): - try: - data = plugin.data() - except: - import traceback - traceback.print_exc() - else: - data = plugin.data + data = plugin.data try: iter(data) retval.extend(data) @@ -416,14 +409,7 @@ class BasePluginManager(object): mod = self.load_plugin(plugin) if hasattr(mod, plugin.process): process = getattr(mod, plugin.process) - if callable(plugin.data): - try: - data = plugin.data() - except: - import traceback - traceback.print_exc() - else: - data = plugin.data + data = plugin.data if data: try: iter(data)