From edbdbfb8bafd8510976bbc71b1f6672bd2fb5018 Mon Sep 17 00:00:00 2001 From: Luke Macken Date: Tue, 15 Jan 2008 18:58:43 -0500 Subject: Combine our is{class,subclass} checks into a single conditional --- func/minion/module_loader.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'func') diff --git a/func/minion/module_loader.py b/func/minion/module_loader.py index f8f8f42..37bc515 100755 --- a/func/minion/module_loader.py +++ b/func/minion/module_loader.py @@ -85,10 +85,9 @@ def load_modules(blacklist=None): blip = __import__("modules.%s" % ( mod_imp_name), globals(), locals(), [mod_imp_name]) for obj in dir(blip): attr = getattr(blip, obj) - if isclass(attr): - if issubclass(attr, func_module.FuncModule): - logger.debug("Loading %s module" % attr) - mods[mod_imp_name] = attr() + if isclass(attr) and issubclass(attr, func_module.FuncModule): + logger.debug("Loading %s module" % attr) + mods[mod_imp_name] = attr() except ImportError, e: # A module that raises an ImportError is (for now) simply not loaded. -- cgit