From d210f3223fc9715df0c2494e82302d60ffa2411e Mon Sep 17 00:00:00 2001 From: Bryan Bennett Date: Wed, 23 Dec 2015 11:32:54 -0500 Subject: [PATCH] Call dbus dependent code only if dbus imported Addresses another symptom of mopidy/mopidy#1335 --- mopidy/zeroconf.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/mopidy/zeroconf.py b/mopidy/zeroconf.py index 7af2f77b..9b7b3808 100644 --- a/mopidy/zeroconf.py +++ b/mopidy/zeroconf.py @@ -58,16 +58,17 @@ class Zeroconf(object): self.display_hostname = None self.name = None - try: - self.bus = dbus.SystemBus() - self.server = dbus.Interface( - self.bus.get_object('org.freedesktop.Avahi', '/'), - 'org.freedesktop.Avahi.Server') - self.display_hostname = '%s' % self.server.GetHostName() - self.name = string.Template(name).safe_substitute( - hostname=self.display_hostname, port=port) - except dbus.exceptions.DBusException as e: - logger.debug('%s: Server failed: %s', self, e) + if dbus: + try: + self.bus = dbus.SystemBus() + self.server = dbus.Interface( + self.bus.get_object('org.freedesktop.Avahi', '/'), + 'org.freedesktop.Avahi.Server') + self.display_hostname = '%s' % self.server.GetHostName() + self.name = string.Template(name).safe_substitute( + hostname=self.display_hostname, port=port) + except dbus.exceptions.DBusException as e: + logger.debug('%s: Server failed: %s', self, e) def __str__(self): return 'Zeroconf service "%s" (%s at [%s]:%d)' % (