From 8e5ac58952689162453a965d4ae1a4adfa02c293 Mon Sep 17 00:00:00 2001 From: Julien Richard-Foy Date: Fri, 6 May 2011 17:24:31 +0200 Subject: [PATCH] Fix module commands loading --- framework/pym/play/cmdloader.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/framework/pym/play/cmdloader.py b/framework/pym/play/cmdloader.py index afeb3bc62b..fa4406cecd 100644 --- a/framework/pym/play/cmdloader.py +++ b/framework/pym/play/cmdloader.py @@ -35,20 +35,21 @@ def load_play_module(self, modname): self._load_cmd_from(mod) except Exception, e: print '~' - print '~ !! Error whileloading %s: %s' % (commands, e) + print '~ !! Error while loading %s: %s' % (commands, e) print '~' pass # No command to load in this module def _load_cmd_from(self, mod): - try: + if 'COMMANDS' in dir(mod): for name in mod.COMMANDS: - if name in self.commands: - print "~ Warning: conflict on command " + name - self.commands[name] = mod - if 'MODULE' in dir(mod): - self.modules[mod.MODULE] = mod - except Exception: - warnings.warn("Warning: error loading command " + name) + try: + if name in self.commands: + warnings.warn("Warning: conflict on command " + name) + self.commands[name] = mod + except Exception: + warnings.warn("Warning: error loading command " + name) + if 'MODULE' in dir(mod): + self.modules[mod.MODULE] = mod def load_python_module(name, location): mod_desc = imp.find_module(name, [location])