From 2ed8fa2b8a4dab5f15130d44b7980f37c236d912 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sat, 22 Apr 2006 12:57:39 +0000 Subject: fix regular expressions for enumerating service types git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1189 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- avahi-python/avahi/ServiceTypeDatabase.py.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/avahi-python/avahi/ServiceTypeDatabase.py.in b/avahi-python/avahi/ServiceTypeDatabase.py.in index 66b29c8..25807f3 100644 --- a/avahi-python/avahi/ServiceTypeDatabase.py.in +++ b/avahi-python/avahi/ServiceTypeDatabase.py.in @@ -71,7 +71,7 @@ class ServiceTypeDatabase: items = [] key = self.db.firstkey() while key is not None: - if re.search('_\w*\._\w*', key) and not re.search('_\w*\._\w*\[.*\]', key): + if re.search('_[a-zA-Z0-9-]+\._[a-zA-Z0-9-]+', key) and not re.search('_[a-zA-Z0-9-]+\._[a-zA-Z0-9-]+\[.*\]', key): localized_service_name = self[key] items.append((key, localized_service_name)) key = self.db.nextkey(key) @@ -100,6 +100,7 @@ class ServiceTypeDatabase: if __name__ == "__main__": b = ServiceTypeDatabase() + print b.items() print b["_http._tcp"] print b["_ftp._tcp"] -- cgit