diff options
author | Petr Viktorin <pviktori@redhat.com> | 2013-01-21 04:34:44 -0500 |
---|---|---|
committer | Martin Kosek <mkosek@redhat.com> | 2013-03-01 16:59:44 +0100 |
commit | c613caab67337293a410c07713c89345d0124f2c (patch) | |
tree | fc0712cd0c5bcb367d53897679e4efdc030578b8 /ipaserver/install/ldapupdate.py | |
parent | b2dd8d7f0512dff47bd5b1b973da50dd56a2e99e (diff) | |
download | freeipa-c613caab67337293a410c07713c89345d0124f2c.tar.gz freeipa-c613caab67337293a410c07713c89345d0124f2c.tar.xz freeipa-c613caab67337293a410c07713c89345d0124f2c.zip |
Replace entry.getValues() by entry.get()
Part of the work for: https://fedorahosted.org/freeipa/ticket/2660
Diffstat (limited to 'ipaserver/install/ldapupdate.py')
-rw-r--r-- | ipaserver/install/ldapupdate.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ipaserver/install/ldapupdate.py b/ipaserver/install/ldapupdate.py index 5de43749b..90975d7d7 100644 --- a/ipaserver/install/ldapupdate.py +++ b/ipaserver/install/ldapupdate.py @@ -494,7 +494,7 @@ class LDAPUpdate: for item in default: # We already do syntax-parsing so this is safe (attr, value) = item.split(':',1) - e = entry.getValues(attr) + e = entry.get(attr) if e: # multi-valued attribute e = list(e) @@ -538,7 +538,7 @@ class LDAPUpdate: if self.conn.has_dn_syntax(attr): update_values = [DN(x) for x in update_values] - entry_values = entry.getValues(attr) + entry_values = entry.get(attr) if not isinstance(entry_values, list): if entry_values is None: entry_values = [] @@ -607,7 +607,7 @@ class LDAPUpdate: self.debug("addifexist: '%s' to %s, current value %s", update_value, attr, entry_values) # Only add the attribute if the entry doesn't exist. We # determine this based on whether it has an objectclass - if entry.getValues('objectclass'): + if entry.get('objectclass'): entry_values.append(update_value) self.debug('addifexist: set %s to %s', attr, entry_values) entry.setValues(attr, entry_values) @@ -624,7 +624,7 @@ class LDAPUpdate: self.debug("onlyifexist: '%s' to %s, current value %s", update_value, attr, entry_values) # Only set the attribute if the entry exist's. We # determine this based on whether it has an objectclass - if entry.getValues('objectclass'): + if entry.get('objectclass'): if only.get(attr): entry_values.append(update_value) else: @@ -681,7 +681,7 @@ class LDAPUpdate: self.debug("dn: %s", e.dn) attr = e.attrList() for a in attr: - value = e.getValues(a) + value = e.get(a) if isinstance(value, (list, tuple)): self.debug('%s:', a) for l in value: |