From 918e3d545150bbaecb6c283dbbd85d67291086e3 Mon Sep 17 00:00:00 2001 From: Steve 'Ashcrow' Milner Date: Sun, 27 Jan 2008 19:36:00 -0500 Subject: Fixed typo per ticket:13. --- docs/func.pod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/func.pod b/docs/func.pod index ead976d..5ee594b 100644 --- a/docs/func.pod +++ b/docs/func.pod @@ -4,7 +4,7 @@ Func -- Fedora Unified Network Controller. =head1 SYNOPSIS -func "*" list_minons +func "*" list_minions func target.example.org call module method [args ...] -- cgit From f099101e300bf7e23ccddcccb4dad73114a834f0 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Mon, 28 Jan 2008 12:51:27 -0500 Subject: Load classes out of __init__ files Conflicts: --- func/minion/module_loader.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/func/minion/module_loader.py b/func/minion/module_loader.py index 37bc515..3068ea8 100755 --- a/func/minion/module_loader.py +++ b/func/minion/module_loader.py @@ -32,9 +32,6 @@ def module_walker(topdir): for filename in files: # ASSUMPTION: all module files will end with .py, .pyc, .pyo if filename[-3:] == ".py" or filename[-4:] == ".pyc" or filename[-4:] == ".pyo": - # we don't really care about __init__ files, though we do requure them - if filename[:8] == "__init__": - continue # the normpath is important, since we eventually replace /'s with .'s # in the module name, and foo..bar doesnt work -akl module_files.append(os.path.normpath("%s/%s" % (root, filename))) @@ -59,9 +56,10 @@ def load_modules(blacklist=None): module_name_part = fn[len(module_file_path):] dirname, basename = os.path.split(module_name_part) - if basename == "__init__.py": - continue - if basename[-3:] == ".py": + if basename[:8] == "__init__": + modname = dirname + dirname = "" + elif basename[-3:] == ".py": modname = basename[:-3] elif basename[-4:] in [".pyc", ".pyo"]: modname = basename[:-4] -- cgit