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

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
shell/PresenceService/PresenceService.py
View File

@ -1,4 +1,4 @@
import avahi, dbus, dbus.glib, dbus.dbus_bindings, gobject
import avahi, dbus, dbus.glib, gobject
import Buddy
import Service
import random
@ -603,7 +603,7 @@ class PresenceService(object):
domain, "", # let Avahi figure the 'host' out
dbus.UInt16(port), info,)
group.Commit()
except dbus.dbus_bindings.DBusException, exc:
except dbus.exceptions.DBusException, exc:
# FIXME: ignore local name collisions, since that means
# the zeroconf service is already registered. Ideally we
# should un-register it an re-register with the correct info

106
sugar/p2p/presence.py
View File

@ -1,106 +0,0 @@
# -*- tab-width: 4; indent-tabs-mode: t -*-
import avahi, dbus, dbus.glib, dbus.dbus_bindings
ACTION_SERVICE_NEW = 'new'
ACTION_SERVICE_REMOVED = 'removed'
class PresenceDiscovery(object):
def __init__(self):
self.bus = dbus.SystemBus()
self.server = dbus.Interface(self.bus.get_object(avahi.DBUS_NAME, avahi.DBUS_PATH_SERVER), avahi.DBUS_INTERFACE_SERVER)
self._service_browsers = {}
self._service_type_browsers = {}
self._service_listeners = []
def add_service_listener(self, listener):
self._service_listeners.append(listener)
def start(self):
# Always browse .local
self.browse_domain(avahi.IF_UNSPEC, avahi.PROTO_UNSPEC, "local")
db = dbus.Interface(self.bus.get_object(avahi.DBUS_NAME, self.server.DomainBrowserNew(avahi.IF_UNSPEC, avahi.PROTO_UNSPEC, "", avahi.DOMAIN_BROWSER_BROWSE, dbus.UInt32(0))), avahi.DBUS_INTERFACE_DOMAIN_BROWSER)
db.connect_to_signal('ItemNew', self.new_domain)
def _error_handler(self, err):
print "Error resolving: %s" % err
def resolve_service(self, interface, protocol, name, stype, domain, reply_handler, error_handler=None):
if not error_handler:
error_handler = self._error_handler
self.server.ResolveService(int(interface), int(protocol), name, stype, domain, avahi.PROTO_UNSPEC, dbus.UInt32(0), reply_handler=reply_handler, error_handler=error_handler)
def new_service(self, interface, protocol, name, stype, domain, flags):
# print "Found service '%s' (%d) of type '%s' in domain '%s' on %i.%i." % (name, flags, stype, domain, interface, protocol)
for listener in self._service_listeners:
listener(ACTION_SERVICE_NEW, interface, protocol, name, stype, domain, flags)
def remove_service(self, interface, protocol, name, stype, domain, flags):
# print "Service '%s' of type '%s' in domain '%s' on %i.%i disappeared." % (name, stype, domain, interface, protocol)
for listener in self._service_listeners:
listener(ACTION_SERVICE_REMOVED, interface, protocol, name, stype, domain, flags)
def new_service_type(self, interface, protocol, stype, domain, flags):
# Are we already browsing this domain for this type?
if self._service_browsers.has_key((interface, protocol, stype, domain)):
return
# print "Browsing for services of type '%s' in domain '%s' on %i.%i ..." % (stype, domain, interface, protocol)
b = dbus.Interface(self.bus.get_object(avahi.DBUS_NAME, self.server.ServiceBrowserNew(interface, protocol, stype, domain, dbus.UInt32(0))), avahi.DBUS_INTERFACE_SERVICE_BROWSER)
b.connect_to_signal('ItemNew', self.new_service)
b.connect_to_signal('ItemRemove', self.remove_service)
self._service_browsers[(interface, protocol, stype, domain)] = b
def browse_domain(self, interface, protocol, domain):
# Are we already browsing this domain?
if self._service_type_browsers.has_key((interface, protocol, domain)):
return
# print "Browsing domain '%s' on %i.%i ..." % (domain, interface, protocol)
try:
b = dbus.Interface(self.bus.get_object(avahi.DBUS_NAME, self.server.ServiceTypeBrowserNew(interface, protocol, domain, dbus.UInt32(0))), avahi.DBUS_INTERFACE_SERVICE_TYPE_BROWSER)
except dbus.DBusException, exc:
str_exc = str(exc)
if str_exc.find("The name org.freedesktop.Avahi was not provided by any .service files") >= 0:
raise Exception("Avahi does not appear to be running. '%s'" % str_exc)
else:
raise exc
b.connect_to_signal('ItemNew', self.new_service_type)
self._service_type_browsers[(interface, protocol, domain)] = b
def new_domain(self, interface, protocol, domain, flags):
if domain != "local":
return
self.browse_domain(interface, protocol, domain)
class PresenceAnnounce(object):
def __init__(self):
self.bus = dbus.SystemBus()
self.server = dbus.Interface(self.bus.get_object(avahi.DBUS_NAME, avahi.DBUS_PATH_SERVER), avahi.DBUS_INTERFACE_SERVER)
self._hostname = None
def register_service(self, rs_name, rs_port, rs_service, **kwargs):
g = dbus.Interface(self.bus.get_object(avahi.DBUS_NAME, self.server.EntryGroupNew()), avahi.DBUS_INTERFACE_ENTRY_GROUP)
if rs_name is None:
if self._hostname is None:
self._hostname = "%s:%s" % (self.server.GetHostName(), rs_port)
rs_name = self._hostname
info = ["%s=%s" % (k, v) for k, v in kwargs.items()]
try:
g.AddService(avahi.IF_UNSPEC, avahi.PROTO_UNSPEC, 0, rs_name, rs_service,
"", "", # domain, host (let the system figure it out)
dbus.UInt16(rs_port), info,)
g.Commit()
except dbus.dbus_bindings.DBusException, exc:
# FIXME: ignore local name collisions, since that means
# the zeroconf service is already registered. Ideally we
# should un-register it an re-register with the correct info
if str(exc) == "Local name collision":
pass
return g

4
sugar/presence/Activity.py
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)

6
sugar/presence/Buddy.py
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:

10
sugar/presence/PresenceService.py
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)

2
sugar/presence/Service.py
View File

@ -1,5 +1,5 @@
import gobject
import dbus, dbus_bindings
import dbus
class Service(gobject.GObject):