merge master into the export_methods branch

1 files changed, 2 insertions, 4 deletions

diff --git a/func/minion/modules/func_module.py b/func/minion/modules/func_module.py
index 56f21f9..a405198 100644
--- a/func/minion/modules/func_module.py
+++ b/func/minion/modules/func_module.py
@@ -15,6 +15,7 @@ import inspect
 from func import logger
 from certmaster.config import read_config, BaseConfig
 from func.commonconfig import FuncdConfig
+from func.utils import is_public_valid_method
 from func.minion.func_arg import * #the arg getter stuff
 
 class FuncModule(object):
@@ -85,10 +86,7 @@ class FuncModule(object):
         return self.description
 
     def __is_public_valid_method(self,attr):
-        if inspect.ismethod(getattr(self, attr)) and attr[0] != '_' and\
-                attr != 'register_rpc' and attr!='register_method_args':
-                    return True
-        return False
+        return is_public_valid_method(self, attr, blacklist=['register_rpc', 'register_method_args'])
 
     def __get_method_args(self):
         """