Do not use dbus_bindings for exceptions. Use dbus.exceptions. Thanks J5 to point it out.

4 files changed, 11 insertions, 11 deletions

diff --git a/sugar/presence/Activity.py b/sugar/presence/Activity.py
index a7c2f7a..43e6755 100644
--- a/sugar/presence/Activity.py
+++ b/sugar/presence/Activity.py
@@ -1,5 +1,5 @@
 import gobject
-import dbus, dbus_bindings
+import dbus
 
 class Activity(gobject.GObject):
 
@@ -69,7 +69,7 @@ class Activity(gobject.GObject):
 	def get_service_of_type(self, stype):
 		try:
 			object_path = self._buddy.getServiceOfType(stype)
-		except dbus_bindings.DBusException:
+		except dbus.exceptions.DBusException:
 			return None
 		return self._ps_new_object(object_path)
 
diff --git a/sugar/presence/Buddy.py b/sugar/presence/Buddy.py
index d32e998..1732790 100644
--- a/sugar/presence/Buddy.py
+++ b/sugar/presence/Buddy.py
@@ -1,6 +1,6 @@
 import gobject
 import gtk
-import dbus, dbus_bindings
+import dbus
 
 class Buddy(gobject.GObject):
 
@@ -110,14 +110,14 @@ class Buddy(gobject.GObject):
 	def get_service_of_type(self, stype):
 		try:
 			object_path = self._buddy.getServiceOfType(stype)
-		except dbus_bindings.DBusException:
+		except dbus.exceptions.DBusException:
 			return None
 		return self._ps_new_object(object_path)
 
 	def get_joined_activities(self):
 		try:
 			resp = self._buddy.getJoinedActivities()
-		except dbus_bindings.DBusException:
+		except dbus.exceptions.DBusException:
 			return []
 		acts = []
 		for item in resp:
diff --git a/sugar/presence/PresenceService.py b/sugar/presence/PresenceService.py
index 8cbbb28..b64934d 100644
--- a/sugar/presence/PresenceService.py
+++ b/sugar/presence/PresenceService.py
@@ -1,4 +1,4 @@
-import dbus, dbus.glib, dbus.dbus_bindings, gobject
+import dbus, dbus.glib, gobject
 
 import Buddy, Service, Activity
 
@@ -149,7 +149,7 @@ class PresenceService(gobject.GObject):
 	def get_activity(self, activity_id):
 		try:
 			act_op = self._ps.getActivity(activity_id)
-		except dbus.dbus_bindings.DBusException:
+		except dbus.exceptions.DBusException:
 			return None
 		return self._new_object(act_op)
 
@@ -163,21 +163,21 @@ class PresenceService(gobject.GObject):
 	def get_buddy_by_name(self, name):
 		try:
 			buddy_op = self._ps.getBuddyByName(name)
-		except dbus.dbus_bindings.DBusException:
+		except dbus.exceptions.DBusException:
 			return None
 		return self._new_object(buddy_op)
 
 	def get_buddy_by_address(self, addr):
 		try:
 			buddy_op = self._ps.getBuddyByAddress(addr)
-		except dbus.dbus_bindings.DBusException:
+		except dbus.exceptions.DBusException:
 			return None
 		return self._new_object(buddy_op)
 
 	def get_owner(self):
 		try:
 			owner_op = self._ps.getOwner()
-		except dbus.dbus_bindings.DBusException:
+		except dbus.exceptions.DBusException:
 			return None
 		return self._new_object(owner_op)
 
diff --git a/sugar/presence/Service.py b/sugar/presence/Service.py
index 1b09161..0a01da4 100644
--- a/sugar/presence/Service.py
+++ b/sugar/presence/Service.py
@@ -1,5 +1,5 @@
 import gobject
-import dbus, dbus_bindings
+import dbus
 
 
 class Service(gobject.GObject):