diff options
Diffstat (limited to 'avahi-python')
| -rw-r--r-- | avahi-python/avahi/Makefile.am | 7 | ||||
| -rw-r--r-- | avahi-python/avahi/ServiceTypeDatabase.py.in | 16 |
2 files changed, 12 insertions, 11 deletions
diff --git a/avahi-python/avahi/Makefile.am b/avahi-python/avahi/Makefile.am index 907c5eb..0813986 100644 --- a/avahi-python/avahi/Makefile.am +++ b/avahi-python/avahi/Makefile.am @@ -17,11 +17,12 @@ EXTRA_DIST = __init__.py ServiceTypeDatabase.py.in +pkglibdatadir=$(prefix)/lib/avahi + if HAVE_PYTHON avahidir = $(pythondir)/avahi - if HAVE_GDBM nodist_avahi_SCRIPTS = ServiceTypeDatabase.py @@ -31,7 +32,7 @@ ServiceTypeDatabase.py: ServiceTypeDatabase.py.in -e 's,@FIRST_KEY\@,key = self.db.firstkey(),g' \ -e 's,@CHECK_KEY\@,while key is not None:,g' \ -e 's,@NEXT_KEY\@,key = self.db.nextkey(key),g' \ - -e 's,@pkglibdir\@,$(pkglibdir),g' $< > $@ && \ + -e 's,@pkglibdatadir\@,$(pkglibdatadir),g' $< > $@ && \ chmod +x $@ endif @@ -44,7 +45,7 @@ ServiceTypeDatabase.py: ServiceTypeDatabase.py.in -e 's,@FIRST_KEY\@,keys = self.db.keys(),g' \ -e 's,@CHECK_KEY\@,for key in keys:,g' \ -e 's,@NEXT_KEY\@,,g' \ - -e 's,@pkglibdir\@,$(pkglibdir),g' $< > $@ && \ + -e 's,@pkglibdatadir\@,$(pkglibdatadir),g' $< > $@ && \ chmod +x $@ endif diff --git a/avahi-python/avahi/ServiceTypeDatabase.py.in b/avahi-python/avahi/ServiceTypeDatabase.py.in index 8ad8d5e..b2035fd 100644 --- a/avahi-python/avahi/ServiceTypeDatabase.py.in +++ b/avahi-python/avahi/ServiceTypeDatabase.py.in @@ -26,7 +26,7 @@ locale.setlocale(locale.LC_ALL, '') class ServiceTypeDatabase: """ServiceTypeDatabase maps service types to descriptions""" - def __init__(self, filename = "@pkglibdir@/service-types.db"): + def __init__(self, filename = "@pkglibdatadir@/service-types.db"): self.db = @DBM@.open(filename, "r") @@ -46,13 +46,13 @@ class ServiceTypeDatabase: if i >= 0: k = l[0][:i] - + if not l[1] is None: self.suffixes += (k + "@" + l[1], ) self.suffixes += (k, ) - - + + self.suffixes = tuple(map(lambda x: "["+x+"]", self.suffixes)) + ("", ) def __getitem__(self, key): @@ -75,7 +75,7 @@ class ServiceTypeDatabase: if self.db.has_key(key + suffix): return True - + return False def __contains__(self, item): @@ -86,7 +86,7 @@ class ServiceTypeDatabase: return True return False - + def __iter__(self): @@ -134,9 +134,9 @@ class ServiceTypeDatabase: def values(self): return list(self.itervalues()) - + if __name__ == "__main__": - + b = ServiceTypeDatabase() print b.items() |