From 17252fe8ef42fc27f922b8211178a460c8ee73f7 Mon Sep 17 00:00:00 2001 From: "Krzysztof A. Adamski" Date: Fri, 8 Aug 2008 19:13:52 -0400 Subject: Fix circular import. --- func/module_loader.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'func/module_loader.py') diff --git a/func/module_loader.py b/func/module_loader.py index 66045d1..6f2f0e8 100755 --- a/func/module_loader.py +++ b/func/module_loader.py @@ -25,6 +25,7 @@ logger = logger.Logger().logger from inspect import isclass from func.minion.modules import func_module +from func.utils import is_public_valid_method def module_walker(topdir): module_files = [] @@ -111,15 +112,6 @@ def load_modules(path='func/minion/modules/', main_class=func_module.FuncModule, return mods -def is_public_valid_method(obj, attr, blacklist=[]): - if inspect.ismethod(getattr(obj, attr)) and attr[0] != '_': - for b in blacklist: - if attr==b: - return False - return True - return False - - if __name__ == "__main__": module_file_path = "/usr/lib/python2.5/site-packages/func/minion/modules/" -- cgit