Fix circular import.

3 files changed, 11 insertions, 11 deletions

diff --git a/func/minion/modules/func_module.py b/func/minion/modules/func_module.py
index 6586d40..a405198 100644
--- a/func/minion/modules/func_module.py
+++ b/func/minion/modules/func_module.py
@@ -15,7 +15,7 @@ import inspect
 from func import logger
 from certmaster.config import read_config, BaseConfig
 from func.commonconfig import FuncdConfig
-import func.module_loader
+from func.utils import is_public_valid_method
 from func.minion.func_arg import * #the arg getter stuff
 
 class FuncModule(object):
@@ -86,7 +86,7 @@ class FuncModule(object):
         return self.description
 
     def __is_public_valid_method(self,attr):
-        return func.module_loader.is_public_valid_method(self, attr, blacklist=['register_rpc', 'register_method_args'])
+        return is_public_valid_method(self, attr, blacklist=['register_rpc', 'register_method_args'])
 
     def __get_method_args(self):
         """
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/"
diff --git a/func/utils.py b/func/utils.py
index 628694d..891f459 100755
--- a/func/utils.py
+++ b/func/utils.py
@@ -15,6 +15,7 @@ import string
 import sys
 import traceback
 import socket
+import inspect
 
 REMOTE_ERROR = "REMOTE_ERROR"
 
@@ -52,3 +53,10 @@ def get_formated_jobid(**id_pack):
     job_id = "".join([glob,"-",module,"-",method,"-",pprint.pformat(time.time())])
     return job_id
 
+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