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

This commit is contained in:
Marco Pesenti Gritti
2006-07-25 22:52:45 +02:00
parent ef71679ed6
commit 1ef5c576c2
6 changed files with 13 additions and 119 deletions
+2 -2
View File
@@ -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)
+3 -3
View File
@@ -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:
+5 -5
View File
@@ -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)
+1 -1
View File
@@ -1,5 +1,5 @@
import gobject
import dbus, dbus_bindings
import dbus
class Service(gobject.GObject):