diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-05-18 14:33:21 (GMT) |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-05-18 14:33:21 (GMT) |
commit | ccc224e76f4fff2d800ac2dae2527d361415a1cf (patch) | |
tree | 64f48ea35beda780483125207d486c866ec1263b /sugar/presence | |
parent | 29cc39968d491288ee460c8daa066479592d7e2b (diff) |
sugar.presence.presenceservice: Use absolute imports
Diffstat (limited to 'sugar/presence')
-rw-r--r-- | sugar/presence/presenceservice.py | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/sugar/presence/presenceservice.py b/sugar/presence/presenceservice.py index 9d435e7..a0b60ee 100644 --- a/sugar/presence/presenceservice.py +++ b/sugar/presence/presenceservice.py @@ -23,17 +23,8 @@ import dbus.exceptions import dbus.glib import gobject -# XXX use absolute imports -# from sugar.presence import buddy, activity -# this *kind* of relative import is deprecated -# with an explicit relative import slated to be -# introduced (available in Python 2.5 with a __future__ -# import), that would read as: -# from . import buddy, activity -# see PEP: http://docs.python.org/whatsnew/pep-328.html - -import buddy -from activity import Activity +from sugar.presence.buddy import Buddy +from sugar.presence.activity import Activity DBUS_SERVICE = "org.laptop.Sugar.Presence" @@ -163,7 +154,7 @@ class PresenceService(gobject.GObject): obj = self._objcache[object_path] except KeyError: if object_path.startswith(self._PS_BUDDY_OP): - obj = buddy.Buddy(self._bus, self._new_object, + obj = Buddy(self._bus, self._new_object, self._del_object, object_path) elif object_path.startswith(self._PS_ACTIVITY_OP): obj = Activity(self._bus, self._new_object, |