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>

1 files changed, 9 insertions, 0 deletions

diff --git a/ipatests/test_ipaserver/test_ldap.py b/ipatests/test_ipaserver/test_ldap.py
index 05ae87c1c..28e84fb70 100644
--- a/ipatests/test_ipaserver/test_ldap.py
+++ b/ipatests/test_ipaserver/test_ldap.py
@@ -26,7 +26,9 @@
 # The DM password needs to be set in ~/.ipa/.dmpw
 
 import os
+import sys
 
+import pytest
 import nose
 from nose.tools import assert_raises  # pylint: disable=E0611
 import nss.nss as nss
@@ -238,12 +240,19 @@ class test_LDAPEntry(object):
         assert not e
         assert 'cn' not in e
 
+    @pytest.mark.skipif(sys.version_info >= (3, 0), reason="Python 2 only")
     def test_has_key(self):
         e = self.entry
         assert not e.has_key('xyz')
         assert e.has_key('cn')
         assert e.has_key('COMMONNAME')
 
+    def test_in(self):
+        e = self.entry
+        assert 'xyz' not in e
+        assert 'cn' in e
+        assert 'COMMONNAME' in e
+
     def test_get(self):
         e = self.entry
         assert e.get('cn') == self.cn1