diff options
author | Lance Stout <lancestout@gmail.com> | 2012-06-19 01:38:12 -0700 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2012-06-19 01:38:12 -0700 |
commit | 061489f03ad889d85d556b94a41ba05724e54f9c (patch) | |
tree | 5d45f1b48de494c44281ea8593404c240ef3132c /sleekxmpp | |
parent | d92aa05b5c18806ab5addc947eeedaaf4d51500e (diff) | |
download | slixmpp-061489f03ad889d85d556b94a41ba05724e54f9c.tar.gz slixmpp-061489f03ad889d85d556b94a41ba05724e54f9c.tar.bz2 slixmpp-061489f03ad889d85d556b94a41ba05724e54f9c.tar.xz slixmpp-061489f03ad889d85d556b94a41ba05724e54f9c.zip |
Limit except clause to just ImportErrors when loading plugins.
Diffstat (limited to 'sleekxmpp')
-rw-r--r-- | sleekxmpp/plugins/base.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sleekxmpp/plugins/base.py b/sleekxmpp/plugins/base.py index 5a298b72..337db2db 100644 --- a/sleekxmpp/plugins/base.py +++ b/sleekxmpp/plugins/base.py @@ -84,7 +84,7 @@ def load_plugin(name, module=None): module = 'sleekxmpp.plugins.%s' % name __import__(module) mod = sys.modules[module] - except: + except ImportError: module = 'sleekxmpp.features.%s' % name __import__(module) mod = sys.modules[module] @@ -103,7 +103,7 @@ def load_plugin(name, module=None): # we can work around dependency issues. plugin.old_style = True register_plugin(plugin, name) - except: + except ImportError: log.exception("Unable to load plugin: %s", name) |