diff options
| author | Seth Vidal <skvidal@fedoraproject.org> | 2007-09-24 13:08:15 -0400 |
|---|---|---|
| committer | Seth Vidal <skvidal@fedoraproject.org> | 2007-09-24 13:08:15 -0400 |
| commit | 8454fe3216f935746fad17a8c48f4df0e40a0d0d (patch) | |
| tree | ac27022d7aa6b9d921399fcb04ccb4a44d839671 /server/module_loader.py | |
| parent | d9a2ea9d3a21bc4041d8aa01d1fb2dee1630177c (diff) | |
| parent | bbf1cf314b20a15eff21a8129bb51415fdead41e (diff) | |
Merge branch 'master' of ssh://git.fedoraproject.org/git/hosted/func
* 'master' of ssh://git.fedoraproject.org/git/hosted/func:
Do not raise ImportError when loading a module.
add system.listMethods support
add some simple support for base object methods
Diffstat (limited to 'server/module_loader.py')
| -rwxr-xr-x | server/module_loader.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/server/module_loader.py b/server/module_loader.py index 2b20429..a2a00c5 100755 --- a/server/module_loader.py +++ b/server/module_loader.py @@ -75,9 +75,8 @@ def load_modules(blacklist=None): continue mods[mod_imp_name] = blip except ImportError, e: - # shouldn't this be fatal? + # A module that raises an ImportError is (for now) simply not loaded. print e - raise return mods |