diff --git a/avahi-python/avahi-discover/avahi-discover.py b/avahi-python/avahi-discover/avahi-discover.py index 95ccca5..704abf8 100755 --- a/avahi-python/avahi-discover/avahi-discover.py +++ b/avahi-python/avahi-discover/avahi-discover.py @@ -209,10 +209,10 @@ class Main_window: self.new_service_type(interface, protocol, self.stype, domain) def new_domain(self,interface, protocol, domain, flags): - if self.zc_ifaces.has_key((interface,protocol)) == False: + if ((interface,protocol) in self.zc_ifaces) == False: ifn = self.get_interface_name(interface, protocol) self.zc_ifaces[(interface,protocol)] = self.insert_row(self.treemodel, None, ifn,None,interface,protocol,None,domain) - if self.zc_domains.has_key((interface,protocol,domain)) == False: + if ((interface,protocol,domain) in self.zc_domains) == False: self.zc_domains[(interface,protocol,domain)] = self.insert_row(self.treemodel, self.zc_ifaces[(interface,protocol)], domain,None,interface,protocol,None,domain) if domain != "local": self.browse_domain(interface, protocol, domain) @@ -233,7 +233,7 @@ class Main_window: if len(txt) != 0: txts = "" txtd = self.pair_to_dict(txt) - for k,v in txtd.items(): + for k,v in list(txtd.items()): txts+="" + _("TXT") + " %s = %s\n" % (k,v) else: txts = "" + _("TXT Data:") + " " + _("empty") + ""