summaryrefslogtreecommitdiff
path: root/sleekxmpp/basexmpp.py
diff options
context:
space:
mode:
authorBrian Beggs <macdiesel@gmail.com>2010-07-01 10:01:52 -0400
committerBrian Beggs <macdiesel@gmail.com>2010-07-01 10:01:52 -0400
commitf477ccf533a9b041e5f32b8b01e8381e05bcadf2 (patch)
tree187bf0f4516cc8cf7b644bf5d4990d305d73dcc1 /sleekxmpp/basexmpp.py
parentd62a30b0f8353640928d11cdfd76ea3c7a9b5cc3 (diff)
parent8bdfa770245ec02efbecf81bc598faa2b66a64f4 (diff)
downloadslixmpp-f477ccf533a9b041e5f32b8b01e8381e05bcadf2.tar.gz
slixmpp-f477ccf533a9b041e5f32b8b01e8381e05bcadf2.tar.bz2
slixmpp-f477ccf533a9b041e5f32b8b01e8381e05bcadf2.tar.xz
slixmpp-f477ccf533a9b041e5f32b8b01e8381e05bcadf2.zip
Merge remote branch 'tom/hacks'
Diffstat (limited to 'sleekxmpp/basexmpp.py')
-rw-r--r--sleekxmpp/basexmpp.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/sleekxmpp/basexmpp.py b/sleekxmpp/basexmpp.py
index 936b5d18..25eeedb0 100644
--- a/sleekxmpp/basexmpp.py
+++ b/sleekxmpp/basexmpp.py
@@ -109,9 +109,9 @@ class basexmpp(object):
if hasattr(self.plugin[plugin], 'xep'):
xep = "(XEP-%s) " % self.plugin[plugin].xep
logging.debug("Loaded Plugin %s%s" % (xep, self.plugin[plugin].description))
- except Exception, e:
- logging.error("Unable to load plugin: %s" %(plugin) )
- logging.exception(e)
+ except:
+ logging.exception("Unable to load plugin: %s", plugin )
+
def register_plugins(self):
"""Initiates all plugins in the plugins/__init__.__all__"""