From a173957865ecbbf85260ecee99a3c86f7b9fde0c Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Fri, 25 Jan 2013 08:42:57 -0500 Subject: Remove toTupleList and attrList from LDAPEntry Part of the work for: https://fedorahosted.org/freeipa/ticket/2660 --- ipaserver/install/ldapupdate.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'ipaserver/install/ldapupdate.py') diff --git a/ipaserver/install/ldapupdate.py b/ipaserver/install/ldapupdate.py index de1298d8..16a47a88 100644 --- a/ipaserver/install/ldapupdate.py +++ b/ipaserver/install/ldapupdate.py @@ -673,9 +673,7 @@ class LDAPUpdate: if message: self.debug("%s", message) self.debug("dn: %s", e.dn) - attr = e.attrList() - for a in attr: - value = e.get(a) + for a, value in e.items(): if isinstance(value, (list, tuple)): self.debug('%s:', a) for l in value: @@ -766,7 +764,7 @@ class LDAPUpdate: # entry.orig_data = {} try: if self.live_run: - if len(entry.toTupleList()) > 0: + if len(entry): # addifexist may result in an entry with only a # dn defined. In that case there is nothing to do. # It means the entry doesn't exist, so skip it. -- cgit