diff options
Diffstat (limited to 'ipalib/plugins/baseldap.py')
| -rw-r--r-- | ipalib/plugins/baseldap.py | 44 |
1 files changed, 18 insertions, 26 deletions
diff --git a/ipalib/plugins/baseldap.py b/ipalib/plugins/baseldap.py index 26b43b90d..a3cfe3ce3 100644 --- a/ipalib/plugins/baseldap.py +++ b/ipalib/plugins/baseldap.py @@ -2100,19 +2100,15 @@ class LDAPAddReverseMember(LDAPModReverseMember): for attr in options.get(self.reverse_attr) or []: try: options = {'%s' % self.member_attr: keys[-1]} - try: - result = self._exc_wrapper(keys, options, self.api.Command[self.member_command])(attr, **options) - if result['completed'] == 1: - completed = completed + 1 - else: - failed['member'][self.reverse_attr].append((attr, result['failed']['member'][self.member_attr][0][1])) - except errors.NotFound, e: - msg = str(e) - (attr, msg) = msg.split(':', 1) - failed['member'][self.reverse_attr].append((attr, unicode(msg.strip()))) - - except errors.PublicError, e: - failed['member'][self.reverse_attr].append((attr, unicode(msg))) + result = self._exc_wrapper(keys, options, self.api.Command[self.member_command])(attr, **options) + if result['completed'] == 1: + completed = completed + 1 + else: + failed['member'][self.reverse_attr].append((attr, result['failed']['member'][self.member_attr][0][1])) + except (errors.PublicError, errors.NotFound) as e: + msg = str(e) + (attr, msg) = msg.split(':', 1) + failed['member'][self.reverse_attr].append((attr, unicode(msg.strip()))) # Update the member data. entry_attrs = ldap.get_entry(dn, ['*']) @@ -2201,19 +2197,15 @@ class LDAPRemoveReverseMember(LDAPModReverseMember): for attr in options.get(self.reverse_attr) or []: try: options = {'%s' % self.member_attr: keys[-1]} - try: - result = self._exc_wrapper(keys, options, self.api.Command[self.member_command])(attr, **options) - if result['completed'] == 1: - completed = completed + 1 - else: - failed['member'][self.reverse_attr].append((attr, result['failed']['member'][self.member_attr][0][1])) - except errors.NotFound, e: - msg = str(e) - (attr, msg) = msg.split(':', 1) - failed['member'][self.reverse_attr].append((attr, unicode(msg.strip()))) - - except errors.PublicError, e: - failed['member'][self.reverse_attr].append((attr, unicode(msg))) + result = self._exc_wrapper(keys, options, self.api.Command[self.member_command])(attr, **options) + if result['completed'] == 1: + completed = completed + 1 + else: + failed['member'][self.reverse_attr].append((attr, result['failed']['member'][self.member_attr][0][1])) + except (errors.PublicError, errors.NotFound) as e: + msg = str(e) + (attr, msg) = msg.split(':', 1) + failed['member'][self.reverse_attr].append((attr, unicode(msg.strip()))) # Update the member data. entry_attrs = ldap.get_entry(dn, ['*']) |