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

sugar.presence.presenceservice: Use absolute imports

Browse Source
This commit is contained in:
Simon McVittie 2007-05-18 15:33:21 +01:00
parent 29cc39968d
commit ccc224e76f
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sugar/presence/presenceservice.py
View File

@ -23,17 +23,8 @@ import dbus.exceptions
import dbus.glib import dbus.glib
import gobject import gobject
# XXX use absolute imports from sugar.presence.buddy import Buddy
# from sugar.presence import buddy, activity from sugar.presence.activity import 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
DBUS_SERVICE = "org.laptop.Sugar.Presence" DBUS_SERVICE = "org.laptop.Sugar.Presence"
@ -163,7 +154,7 @@ class PresenceService(gobject.GObject):
obj = self._objcache[object_path] obj = self._objcache[object_path]
except KeyError: except KeyError:
if object_path.startswith(self._PS_BUDDY_OP): 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) self._del_object, object_path)
elif object_path.startswith(self._PS_ACTIVITY_OP): elif object_path.startswith(self._PS_ACTIVITY_OP):
obj = Activity(self._bus, self._new_object, obj = Activity(self._bus, self._new_object,