Silence W601 .has_key() is deprecated

Related: https://pagure.io/freeipa/issue/8306 Signed-off-by: Christian Heimes <[email protected]> Reviewed-By: Florence Blanc-Renaud <[email protected]>
sgoveas · May 5, 2020 · c544d18 · c544d18
1 parent 186d739
commit c544d18
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/ipapython/ipautil.py b/ipapython/ipautil.py
@@ -701,7 +701,7 @@ def __contains__(self, key):
     if six.PY2:
         def has_key(self, key):
             # pylint: disable=no-member
-            return super(CIDict, self).has_key(key.lower())
+            return super(CIDict, self).has_key(key.lower())  # noqa
             # pylint: enable=no-member
 
     def get(self, key, failobj=None):

diff --git a/ipatests/test_ipapython/test_ipautil.py b/ipatests/test_ipapython/test_ipautil.py
@@ -164,11 +164,11 @@ def test_copy(self):
 
     @pytest.mark.skipif(not six.PY2, reason="Python 2 only")
     def test_haskey(self):
-        assert self.cidict.has_key("KEY1")
-        assert self.cidict.has_key("key2")
-        assert self.cidict.has_key("key3")
+        assert self.cidict.has_key("KEY1")  # noqa
+        assert self.cidict.has_key("key2")  # noqa
+        assert self.cidict.has_key("key3")  # noqa
 
-        assert not self.cidict.has_key("Key4")
+        assert not self.cidict.has_key("Key4")  # noqa
 
     def test_contains(self):
         assert "KEY1" in self.cidict

diff --git a/ipatests/test_ipapython/test_keyring.py b/ipatests/test_ipapython/test_keyring.py
@@ -119,10 +119,10 @@ def test_06(self):
         See if a key is available
         """
         kernel_keyring.add_key(TEST_KEY, TEST_VALUE)
-        assert kernel_keyring.has_key(TEST_KEY)
+        assert kernel_keyring.has_key(TEST_KEY)  # noqa
 
         kernel_keyring.del_key(TEST_KEY)
-        assert not kernel_keyring.has_key(TEST_KEY)
+        assert not kernel_keyring.has_key(TEST_KEY)  # noqa
 
     def test_07(self):
         """

diff --git a/ipatests/test_ipaserver/test_ldap.py b/ipatests/test_ipaserver/test_ldap.py
@@ -249,9 +249,9 @@ def test_clear(self):
     @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')
+        assert not e.has_key('xyz')  # noqa
+        assert e.has_key('cn')  # noqa
+        assert e.has_key('COMMONNAME')  # noqa
 
     def test_in(self):
         e = self.entry