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

Convert print statements to logging.debug

Browse Source
This commit is contained in:
Dan Williams 2007-04-12 14:44:23 -04:00
parent 3d3dd23390
commit 5970bb6e62
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
services/presence/presenceservice.py
View File

@ -16,6 +16,8 @@
import gobject import gobject
import dbus, dbus.service, dbus.glib import dbus, dbus.service, dbus.glib
import logging
from telepathy.client import ManagerRegistry, Connection from telepathy.client import ManagerRegistry, Connection
from telepathy.interfaces import (CONN_MGR_INTERFACE, CONN_INTERFACE) from telepathy.interfaces import (CONN_MGR_INTERFACE, CONN_INTERFACE)
from telepathy.constants import (CONNECTION_STATUS_CONNECTING, CONNECTION_STATUS_CONNECTED, from telepathy.constants import (CONNECTION_STATUS_CONNECTING, CONNECTION_STATUS_CONNECTED,
@ -111,10 +113,10 @@ class PresenceService(dbus.service.Object):
def _buddy_validity_changed_cb(self, buddy, valid): def _buddy_validity_changed_cb(self, buddy, valid):
if valid: if valid:
self.BuddyAppeared(buddy.object_path()) self.BuddyAppeared(buddy.object_path())
print "New Buddy: %s (%s)" % (buddy.props.nick, buddy.props.color) logging.debug("New Buddy: %s (%s)" % (buddy.props.nick, buddy.props.color))
else: else:
self.BuddyDisappeared(buddy.object_path()) self.BuddyDisappeared(buddy.object_path())
print "Buddy left: %s (%s)" % (buddy.props.nick, buddy.props.color) logging.debug("Buddy left: %s (%s)" % (buddy.props.nick, buddy.props.color))
def _contact_offline(self, tp, handle): def _contact_offline(self, tp, handle):
buddy = self._handles_buddies[tp].pop(handle) buddy = self._handles_buddies[tp].pop(handle)
@ -125,7 +127,7 @@ class PresenceService(dbus.service.Object):
if not buddy.handles: if not buddy.handles:
if buddy.props.valid: if buddy.props.valid:
self.BuddyDisappeared(buddy.object_path()) self.BuddyDisappeared(buddy.object_path())
print "Buddy left: %s (%s)" % (buddy.props.nick, buddy.props.color) logging.debug("Buddy left: %s (%s)" % (buddy.props.nick, buddy.props.color))
self._buddies.pop(key) self._buddies.pop(key)
def _get_next_object_id(self): def _get_next_object_id(self):
@ -136,21 +138,21 @@ class PresenceService(dbus.service.Object):
def _avatar_updated(self, tp, handle, avatar): def _avatar_updated(self, tp, handle, avatar):
buddy = self._handles_buddies[tp].get(handle) buddy = self._handles_buddies[tp].get(handle)
if buddy and not buddy.props.owner: if buddy and not buddy.props.owner:
print "Buddy %s icon updated" % buddy.props.key logging.debug("Buddy %s icon updated" % buddy.props.nick)
buddy.props.icon = avatar buddy.props.icon = avatar
def _buddy_properties_changed(self, tp, handle, prop): def _buddy_properties_changed(self, tp, handle, prop):
buddy = self._handles_buddies[tp].get(handle) buddy = self._handles_buddies[tp].get(handle)
if buddy: if buddy:
buddy.set_properties(prop) buddy.set_properties(prop)
#print "Buddy %s properties updated" % buddy.props.key logging.debug("Buddy %s properties updated" % buddy.props.nick)
def _new_activity(self, activity_id, tp): def _new_activity(self, activity_id, tp):
try: try:
objid = self._get_next_object_id() objid = self._get_next_object_id()
activity = Activity(self._bus_name, objid, tp, id=activity_id) activity = Activity(self._bus_name, objid, tp, id=activity_id)
except Exception, e: except Exception, e:
print "Invalid activity: %s" % e logging.debug("Invalid activity: %s" % e)
return None return None
activity.connect("validity-changed", self._activity_validity_changed_cb) activity.connect("validity-changed", self._activity_validity_changed_cb)
@ -171,13 +173,13 @@ class PresenceService(dbus.service.Object):
return activity return activity
def _remove_activity(self, activity): def _remove_activity(self, activity):
print "remove activity", activity.props.id logging.debug("remove activity", activity.props.id)
self.ActivityDisappeared(activity.object_path()) self.ActivityDisappeared(activity.object_path())
del self._activities[activity.props.id] del self._activities[activity.props.id]
def _buddy_activities_changed(self, tp, contact_handle, activities): def _buddy_activities_changed(self, tp, contact_handle, activities):
print "------------activities changed-------------" logging.debug("------------activities changed-------------")
buddies = self._handles_buddies[tp] buddies = self._handles_buddies[tp]
buddy = buddies.get(contact_handle) buddy = buddies.get(contact_handle)
@ -185,7 +187,7 @@ class PresenceService(dbus.service.Object):
# We don't know this buddy # We don't know this buddy
# FIXME: What should we do here? # FIXME: What should we do here?
# FIXME: Do we need to check if the buddy is valid or something? # FIXME: Do we need to check if the buddy is valid or something?
print "contact_activities_changed: buddy unknow" logging.debug("contact_activities_changed: buddy unknown")
return return
old_activities = set() old_activities = set()
@ -196,7 +198,7 @@ class PresenceService(dbus.service.Object):
activities_joined = new_activities - old_activities activities_joined = new_activities - old_activities
for act in activities_joined: for act in activities_joined:
print "buddy", contact_handle, "joined", act logging.debug("Buddy", contact_handle, "joined", act)
activity = self._activities.get(act) activity = self._activities.get(act)
if not activity: if not activity:
# new activity, can fail # new activity, can fail
@ -208,7 +210,7 @@ class PresenceService(dbus.service.Object):
activities_left = old_activities - new_activities activities_left = old_activities - new_activities
for act in activities_left: for act in activities_left:
print "buddy", contact_handle, "left", act logging.debug("Buddy", contact_handle, "left", act)
activity = self._activities.get(act) activity = self._activities.get(act)
if not activity: if not activity:
continue continue
@ -304,6 +306,9 @@ class PresenceService(dbus.service.Object):
def _share_activity(self, actid, atype, name, properties): def _share_activity(self, actid, atype, name, properties):
objid = self._get_next_object_id() objid = self._get_next_object_id()
# FIXME check which tp client we should use to share the activity # FIXME check which tp client we should use to share the activity
import time
start = time.time()
logging.debug("Start share of %s (%s)" % (actid, atype))
color = self._owner.props.color color = self._owner.props.color
activity = Activity(self._bus_name, objid, self._server_plugin, activity = Activity(self._bus_name, objid, self._server_plugin,
id=actid, type=atype, name=name, color=color, local=True) id=actid, type=atype, name=name, color=color, local=True)
@ -312,16 +317,17 @@ class PresenceService(dbus.service.Object):
activity.join() activity.join()
activity.send_properties() activity.send_properties()
logging.debug("End share of %s (%s). Time: %f" % (actid, atype, (float)(time.time() - start)))
return activity return activity
def _activity_validity_changed_cb(self, activity, valid): def _activity_validity_changed_cb(self, activity, valid):
if valid: if valid:
self.ActivityAppeared(activity.object_path()) self.ActivityAppeared(activity.object_path())
print "New Activity: %s (%s)" % (activity.props.name, activity.props.id) logging.debug("New Activity: %s (%s)" % (activity.props.name, activity.props.id))
else: else:
self.ActivityDisappeared(activity.object_path()) self.ActivityDisappeared(activity.object_path())
print "Activity disappeared: %s (%s)" % (activity.props.name, activity.props.id) logging.debug("Activity disappeared: %s (%s)" % (activity.props.name, activity.props.id))
def _activity_properties_changed(self, tp, act_id, props): def _activity_properties_changed(self, tp, act_id, props):
activity = self._activities.get(act_id) activity = self._activities.get(act_id)
@ -336,7 +342,7 @@ def main(test=False):
loop.run() loop.run()
except KeyboardInterrupt: except KeyboardInterrupt:
ps.cleanup() ps.cleanup()
print 'Ctrl+C pressed, exiting...' logging.debug('Ctrl+C pressed, exiting...')
if __name__ == "__main__": if __name__ == "__main__":
main() main()