freifunk/ffmap-backend
8
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #41 from mweinelt/master

Browse source 
fix regressions in alfred.py
This commit is contained in:
Nils Schneider 2015-03-24 23:26:55 +01:00
parent 79ec0eb9d9 90ab26d50b
commit dfccd01b69
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/alfred.py
View file

@ -8,17 +8,15 @@ class Alfred(object):
Bindings for the alfred-json utility Bindings for the alfred-json utility
""" """
def __init__(self, unix_sockpath=None): def __init__(self, unix_sockpath=None):
if unix_sockpath:
if os.path.exists(unix_sockpath):
self.unix_sock = unix_sockpath self.unix_sock = unix_sockpath
else: if unix_sockpath is not None and not os.path.exists(unix_sockpath):
raise RuntimeError('alfred: invalid unix socket path given') raise RuntimeError('alfred: invalid unix socket path given')
def _fetch(self, data_type): def _fetch(self, data_type):
cmd = ['alfred-json', cmd = ['alfred-json',
'-z', '-z',
'-f', 'json', '-f', 'json',
'-r', data_type] '-r', str(data_type)]
if self.unix_sock: if self.unix_sock:
cmd.extend(['-s', self.unix_sock]) cmd.extend(['-s', self.unix_sock])