python-ldap · jdufresne · Dec 18, 2017
diff --git a/Lib/ldap/cidict.py b/Lib/ldap/cidict.py
@@ -5,6 +5,7 @@
 
 See https://www.python-ldap.org/ for details.
 """
+import warnings
 
 from ldap import __version__
 
@@ -39,6 +40,12 @@ def update(self,dict):
       self[key] = dict[key]
 
   def has_key(self,key):
+    warnings.warn(
+      "%s.has_key() is deprecated and will be removed in a future version of "
+      "python-ldap. Use the 'in' operator instead." % self.__class__.__name__,
+      category=DeprecationWarning,
+      stacklevel=2,
+    )
     return key in self
 
   def __contains__(self,key):

diff --git a/Lib/ldap/schema/models.py b/Lib/ldap/schema/models.py
@@ -676,6 +676,12 @@ def __delitem__(self,nameoroid):
     del self._keytuple2attrtype[k]
 
   def has_key(self,nameoroid):
+    warnings.warn(
+      "%s.has_key() is deprecated and will be removed in a future version of "
+      "python-ldap. Use the 'in' operator instead." % self.__class__.__name__,
+      category=DeprecationWarning,
+      stacklevel=2,
+    )
     k = self._at2key(nameoroid)
     return k in self.data
 

diff --git a/Tests/t_cidict.py b/Tests/t_cidict.py
@@ -4,14 +4,22 @@
 
 See https://www.python-ldap.org/ for details.
 """
+from __future__ import unicode_literals
 
-# from Python's standard lib
+import sys
 import unittest
+import warnings
 
 # from python-ldap
 import ldap, ldap.cidict
 
 
+if sys.version_info[0] <= 2:
+    text_type = unicode
+else:
+    text_type = str
+
+
 class TestCidict(unittest.TestCase):
     """
     test ldap.cidict.cidict
@@ -41,8 +49,29 @@ def test_cidict(self):
         self.assertEqual("AbCDef" in cix._keys, False)
         self.assertEqual("abcdef" in cix, False)
         self.assertEqual("AbCDef" in cix, False)
-        self.assertEqual(cix.has_key("abcdef"), False)
-        self.assertEqual(cix.has_key("AbCDef"), False)
+        with warnings.catch_warnings(record=True) as w:
+            warnings.resetwarnings()
+            warnings.simplefilter("always")
+            self.assertEqual(cix.has_key("abcdef"), False)
+        self.assertEqual(len(w), 1)
+        msg = w[-1]
+        self.assertIs(msg.category, DeprecationWarning)
+        self.assertEqual(
+            text_type(msg.message),
+            "cidict.has_key() is deprecated and will be removed in a future version of "
+            "python-ldap. Use the 'in' operator instead."
+        )
+        with warnings.catch_warnings(record=True) as w:
+            warnings.simplefilter("always")
+            self.assertEqual(cix.has_key("AbCDef"), False)
+        self.assertEqual(len(w), 1)
+        msg = w[-1]
+        self.assertIs(msg.category, DeprecationWarning)
+        self.assertEqual(
+            text_type(msg.message),
+            "cidict.has_key() is deprecated and will be removed in a future version of "
+            "python-ldap. Use the 'in' operator instead."
+        )
 
 
 if __name__ == '__main__':