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)
if __name__ == "__main__":
b = ServiceTypeDatabase()
+ print b.items()
print b["_http._tcp"]
print b["_ftp._tcp"]