ldap.schema.models.Entry - Fix init()

Alphix · mistotebe · commit e75c24dd70dc · 2022-03-07T10:38:57.000Z
I'm guessing this is partly due to commit 2be2c6b And the update() method can't ever have worked?
diff --git a/Lib/ldap/schema/models.py b/Lib/ldap/schema/models.py
@@ -7,7 +7,7 @@
 import sys
 
 import ldap.cidict
-from collections import UserDict as IterableUserDict
+from collections import UserDict
 
 from ldap.schema.tokenizer import split_tokens,extract_tokens
 
@@ -640,7 +640,7 @@ def __str__(self):
     return '( %s )' % ''.join(result)
 
 
-class Entry(IterableUserDict):
+class Entry(UserDict):
   """
   Schema-aware implementation of an LDAP entry class.
 
@@ -653,7 +653,7 @@ def __init__(self,schema,dn,entry):
     self._attrtype2keytuple = {}
     self._s = schema
     self.dn = dn
-    IterableUserDict.IterableUserDict.__init__(self,{})
+    super().__init__()
     self.update(entry)
 
   def _at2key(self,nameoroid):
@@ -674,7 +674,7 @@ def _at2key(self,nameoroid):
       return t
 
   def update(self,dict):
-    for key, value in dict.values():
+    for key, value in dict.items():
       self[key] = value
 
   def __contains__(self,nameoroid):
