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

sugar.presence.presenceservice: don't mix up local variable 'activity' and imported module 'activity'

Browse Source
This commit is contained in:
Simon McVittie 2007-05-08 16:23:07 +01:00
parent 6a685d38b4
commit 05d7ed5084
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sugar/presence/presenceservice.py
View File

@ -27,7 +27,9 @@ import logging
# import), that would read as: # import), that would read as:
# from . import buddy, activity # from . import buddy, activity
# see PEP: http://docs.python.org/whatsnew/pep-328.html # see PEP: http://docs.python.org/whatsnew/pep-328.html
import buddy, activity
import buddy
from activity import Activity
DBUS_SERVICE = "org.laptop.Sugar.Presence" DBUS_SERVICE = "org.laptop.Sugar.Presence"
@ -158,7 +160,7 @@ class PresenceService(gobject.GObject):
obj = buddy.Buddy(self._bus, self._new_object, obj = buddy.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.Activity(self._bus, self._new_object, obj = Activity(self._bus, self._new_object,
self._del_object, object_path) self._del_object, object_path)
try: try:
# Pre-fill the activity's ID # Pre-fill the activity's ID
@ -353,7 +355,7 @@ class PresenceService(gobject.GObject):
# Ensure the activity is not already shared/joined # Ensure the activity is not already shared/joined
for obj in self._objcache.values(): for obj in self._objcache.values():
if not isinstance(object, activity.Activity): if not isinstance(object, Activity):
continue continue
if obj.props.id == actid or obj.props.joined: if obj.props.id == actid or obj.props.joined:
raise RuntimeError("Activity %s is already shared." % actid) raise RuntimeError("Activity %s is already shared." % actid)