sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix logging.warn arguments

Browse Source
This commit is contained in:
Guillaume Desmottes 2007-04-25 12:47:29 +02:00
parent cdb727109b
commit a22d8a65f1
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sugar/presence/presenceservice.py
View File

@ -241,8 +241,8 @@ class PresenceService(gobject.GObject):
resp = self._ps.GetActivities() resp = self._ps.GetActivities()
except dbus.exceptions.DBusException, err: except dbus.exceptions.DBusException, err:
logging.warn( logging.warn(
"""Unable to retrieve activity list from presence service: %s""", """Unable to retrieve activity list from presence service: %s"""
err % err
) )
return [] return []
else: else:
@ -263,9 +263,8 @@ class PresenceService(gobject.GObject):
act_op = self._ps.GetActivityById(activity_id) act_op = self._ps.GetActivityById(activity_id)
except dbus.exceptions.DBusException, err: except dbus.exceptions.DBusException, err:
logging.warn( logging.warn(
"""Unable to retrieve activity handle for %r from presence service: %s""", """Unable to retrieve activity handle for %r from presence service: %s"""
activity_id, % (activity_id, err)
err
) )
return None return None
return self._new_object(act_op) return self._new_object(act_op)
@ -280,8 +279,8 @@ class PresenceService(gobject.GObject):
resp = self._ps.GetBuddies() resp = self._ps.GetBuddies()
except dbus.exceptions.DBusException, err: except dbus.exceptions.DBusException, err:
logging.warn( logging.warn(
"""Unable to retrieve buddy-list from presence service: %s""", """Unable to retrieve buddy-list from presence service: %s"""
err % err
) )
return [] return []
else: else:
@ -303,9 +302,8 @@ class PresenceService(gobject.GObject):
buddy_op = self._ps.GetBuddyByPublicKey(dbus.ByteArray(key)) buddy_op = self._ps.GetBuddyByPublicKey(dbus.ByteArray(key))
except dbus.exceptions.DBusException, err: except dbus.exceptions.DBusException, err:
logging.warn( logging.warn(
"""Unable to retrieve buddy handle for %r from presence service: %s""", """Unable to retrieve buddy handle for %r from presence service: %s"""
key, % key, err
err
) )
return None return None
return self._new_object(buddy_op) return self._new_object(buddy_op)
@ -316,8 +314,8 @@ class PresenceService(gobject.GObject):
owner_op = self._ps.GetOwner() owner_op = self._ps.GetOwner()
except dbus.exceptions.DBusException, err: except dbus.exceptions.DBusException, err:
logging.warn( logging.warn(
"""Unable to retrieve local user/owner from presence service: %s""", """Unable to retrieve local user/owner from presence service: %s"""
err % err
) )
raise RuntimeError("Could not get owner object from presence service.") raise RuntimeError("Could not get owner object from presence service.")
return self._new_object(owner_op) return self._new_object(owner_op)