python3: use "foo in dict" not dict.has_key(foo)

has_key() was removed in python3.
t-woerner · Jan 30, 2018 · f837ab2 · f837ab2
1 parent ee5874f
commit f837ab2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/firewall/core/ebtables.py b/src/firewall/core/ebtables.py
@@ -244,7 +244,7 @@ def apply_default_rules(self, transaction, log_denied="off"):
             if table not in self.available_tables():
                 continue
             default_rules = DEFAULT_RULES[table][:]
-            if log_denied != "off" and LOG_RULES.has_key(table):
+            if log_denied != "off" and table in LOG_RULES:
                 default_rules.extend(LOG_RULES[table])
             prefix = [ "-t", table ]
             for rule in DEFAULT_RULES[table]:

diff --git a/src/firewall/core/ipXtables.py b/src/firewall/core/ipXtables.py
@@ -458,7 +458,7 @@ def apply_default_rules(self, transaction, log_denied="off"):
             if table not in self.available_tables():
                 continue
             default_rules = DEFAULT_RULES[table][:]
-            if log_denied != "off" and LOG_RULES.has_key(table):
+            if log_denied != "off" and table in LOG_RULES:
                 default_rules.extend(LOG_RULES[table])
             prefix = [ "-t", table ]
             for rule in DEFAULT_RULES[table]: