Changeset 1220 for dassldapsync/dassldapsync.py

Timestamp:

Nov 15, 2016, 11:28:19 AM (7 years ago)

Author:

joergs

Message:

cleanup

File:

• dassldapsync/dassldapsync.py (modified) (4 diffs)

dassldapsync/dassldapsync.py

@@ -82 +82 @@
     return results
 
-class LdapSync:
+class LdapSync(object):
     def __init__(self, destserver,destbinddn,destbindpw,srcbasedn,destbasedn,options=Options()):
         self.logger = logging.getLogger()
@@ -96 +96 @@
         self.con = None
         
-        self.attrmap=ldap.cidict.cidict({
-        })
-        self.classmap={ 
-        }
+        self.attrmap=ldap.cidict.cidict({})
+        self.classmap={}
 
         self.junk_attrs = [ "memberof", "modifiersname", "modifytimestamp", "entryuuid", "entrycsn", "contextcsn", "creatorsname", "createtimestamp", "structuralobjectclass", "pwdchangedtime", "pwdfailuretime" ]
@@ -264 +262 @@
                     self.notify_created(dn)
                     result['add']['ok'].append(dn)
-                except (ldap.OBJECT_CLASS_VIOLATION,ldap.NO_SUCH_OBJECT):
+                except (ldap.OBJECT_CLASS_VIOLATION, ldap.NO_SUCH_OBJECT, ldap.CONSTRAINT_VIOLATION):
                     self.logger.warning("failed to add {}".format(dn))
                     result['add']['failed'].append(dn)
@@ -360 +358 @@
 
 
-
-
 if __name__ == "__main__":
     logging.basicConfig(format='%(levelname)s %(module)s.%(funcName)s: %(message)s', level=logging.INFO)