summaryrefslogtreecommitdiffstats
path: root/func/module_loader.py
diff options
context:
space:
mode:
authorKrzysztof A. Adamski <krzysztofa@gmail.com>2008-08-08 19:13:52 -0400
committerKrzysztof A. Adamski <krzysztofa@gmail.com>2008-08-08 19:13:52 -0400
commit17252fe8ef42fc27f922b8211178a460c8ee73f7 (patch)
tree7a5378c911dd73fda3b584086cc952659bee74e4 /func/module_loader.py
parenta1ba474f36ba7391accb63f3282138fcd2d480ce (diff)
Fix circular import.
Diffstat (limited to 'func/module_loader.py')
-rwxr-xr-xfunc/module_loader.py10
1 files changed, 1 insertions, 9 deletions
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/"