summaryrefslogtreecommitdiff
path: root/sleekxmpp/basexmpp.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-11-19 12:07:57 -0800
committerLance Stout <lancestout@gmail.com>2011-11-19 12:07:57 -0800
commit429c94d6a90b6f2ae35fa158e7abe04814edd5ef (patch)
tree428733bfda4e01acb0bba4f7e75e8d25c83e3862 /sleekxmpp/basexmpp.py
parentdeb52ad3502a94f91ef5400bf5b7605b8e151f50 (diff)
downloadslixmpp-429c94d6a90b6f2ae35fa158e7abe04814edd5ef.tar.gz
slixmpp-429c94d6a90b6f2ae35fa158e7abe04814edd5ef.tar.bz2
slixmpp-429c94d6a90b6f2ae35fa158e7abe04814edd5ef.tar.xz
slixmpp-429c94d6a90b6f2ae35fa158e7abe04814edd5ef.zip
Tidy up logging calls.
Diffstat (limited to 'sleekxmpp/basexmpp.py')
-rw-r--r--sleekxmpp/basexmpp.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/sleekxmpp/basexmpp.py b/sleekxmpp/basexmpp.py
index 24a7c386..fb2b30cd 100644
--- a/sleekxmpp/basexmpp.py
+++ b/sleekxmpp/basexmpp.py
@@ -246,7 +246,7 @@ class BaseXMPP(XMLStream):
spec = "(RFC-%s) " % self.plugin[plugin].rfc
desc = (spec, self.plugin[plugin].description)
- log.debug("Loaded Plugin %s%s" , desc)
+ log.debug("Loaded Plugin %s%s", desc)
except:
log.exception("Unable to load plugin: %s", plugin)
@@ -282,7 +282,7 @@ class BaseXMPP(XMLStream):
if key in self.plugin:
return self.plugin[key]
else:
- log.warning("""Plugin "%s" is not loaded.""" , key)
+ log.warning("Plugin '%s' is not loaded.", key)
return False
def get(self, key, default):
@@ -679,7 +679,7 @@ class BaseXMPP(XMLStream):
def set_jid(self, jid):
"""Rip a JID apart and claim it as our own."""
- log.debug("setting jid to %s" , jid)
+ log.debug("setting jid to %s", jid)
self.boundjid.full = jid
def getjidresource(self, fulljid):
@@ -790,12 +790,12 @@ class BaseXMPP(XMLStream):
"""
if isinstance(exception, IqError):
iq = exception.iq
- log.error('%s: %s' % (iq['error']['condition'],
- iq['error']['text']))
+ log.error('%s: %s', iq['error']['condition'],
+ iq['error']['text'])
log.warning('You should catch IqError exceptions')
elif isinstance(exception, IqTimeout):
iq = exception.iq
- log.error('Request timed out: %s' , iq)
+ log.error('Request timed out: %s', iq)
log.warning('You should catch IqTimeout exceptions')
else:
log.exception(exception)