andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Call dbus dependent code only if dbus imported

Browse Source 
Addresses another symptom of mopidy/mopidy#1335
This commit is contained in:
Bryan Bennett 2015-12-23 11:32:54 -05:00 committed by Bryan Bennett
parent 128de6cd01
commit d210f3223f
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
mopidy/zeroconf.py
View File

@ -58,16 +58,17 @@ class Zeroconf(object):
self.display_hostname = None self.display_hostname = None
self.name = None self.name = None
try: if dbus:
self.bus = dbus.SystemBus() try:
self.server = dbus.Interface( self.bus = dbus.SystemBus()
self.bus.get_object('org.freedesktop.Avahi', '/'), self.server = dbus.Interface(
'org.freedesktop.Avahi.Server') self.bus.get_object('org.freedesktop.Avahi', '/'),
self.display_hostname = '%s' % self.server.GetHostName() 'org.freedesktop.Avahi.Server')
self.name = string.Template(name).safe_substitute( self.display_hostname = '%s' % self.server.GetHostName()
hostname=self.display_hostname, port=port) self.name = string.Template(name).safe_substitute(
except dbus.exceptions.DBusException as e: hostname=self.display_hostname, port=port)
logger.debug('%s: Server failed: %s', self, e) except dbus.exceptions.DBusException as e:
logger.debug('%s: Server failed: %s', self, e)
def __str__(self): def __str__(self):
return 'Zeroconf service "%s" (%s at [%s]:%d)' % ( return 'Zeroconf service "%s" (%s at [%s]:%d)' % (