Replace dict.has_key with the 'in' operator

The deprecated has_key method will be removed from dicts in Python 3.

For custom dict-like classes, has_key() is kept on Python 2,
but disabled for Python 3.

Reviewed-By: Tomas Babej <tbabej@redhat.com>

4 files changed, 9 insertions, 8 deletions

diff --git a/ipapython/ipa_log_manager.py b/ipapython/ipa_log_manager.py
index 8d01c51a4..c0a5c8d9d 100644
--- a/ipapython/ipa_log_manager.py
+++ b/ipapython/ipa_log_manager.py
@@ -185,7 +185,7 @@ def standard_logging_setup(filename=None, verbose=False, debug=False,
                             format=LOGGING_FORMAT_STANDARD_FILE)
         handlers.append(file_handler)
 
-    if log_mgr.handlers.has_key('console'):
+    if 'console' in log_mgr.handlers:
         log_mgr.remove_handler('console')
     level = 'error'
     if verbose:
diff --git a/ipapython/ipautil.py b/ipapython/ipautil.py
index 280858ce7..ba8312e79 100644
--- a/ipapython/ipautil.py
+++ b/ipapython/ipautil.py
@@ -544,8 +544,9 @@ class CIDict(dict):
     def __contains__(self, key):
         return super(CIDict, self).__contains__(key.lower())
 
-    def has_key(self, key):
-        return super(CIDict, self).has_key(key.lower())
+    if sys.version_info < (3, 0):
+        def has_key(self, key):
+            return super(CIDict, self).has_key(key.lower())
 
     def get(self, key, failobj=None):
         try:
diff --git a/ipapython/log_manager.py b/ipapython/log_manager.py
index cf3611e0f..7e4545d14 100644
--- a/ipapython/log_manager.py
+++ b/ipapython/log_manager.py
@@ -1148,7 +1148,7 @@ class LogManager(object):
             stream = cfg.get("stream")
             log_handler = cfg.get("log_handler")
             if filename:
-                if cfg.has_key("stream"):
+                if "stream" in cfg:
                     raise ValueError("both filename and stream are specified, must be one or the other, config: %s" % cfg)
                 path = os.path.abspath(filename)
                 filemode = cfg.get('filemode', 'a')
diff --git a/ipapython/sysrestore.py b/ipapython/sysrestore.py
index a542b28c9..24ddc9a47 100644
--- a/ipapython/sysrestore.py
+++ b/ipapython/sysrestore.py
@@ -370,10 +370,10 @@ class StateFile:
 
         self._load()
 
-        if not self.modules.has_key(module):
+        if module not in self.modules:
             self.modules[module] = {}
 
-        if not self.modules.has_key(key):
+        if key not in self.modules:
             self.modules[module][key] = value
 
         self.save()
@@ -387,7 +387,7 @@ class StateFile:
         """
         self._load()
 
-        if not self.modules.has_key(module):
+        if module not in self.modules:
             return None
 
         return self.modules[module].get(key, None)
@@ -429,7 +429,7 @@ class StateFile:
         Can be used to determine if a service is configured.
         """
 
-        if self.modules.has_key(module):
+        if module in self.modules:
             return True
         else:
             return False