diff options
-rwxr-xr-x | install/tools/ipa-csreplica-manage | 14 | ||||
-rw-r--r-- | ipaserver/plugins/baseldap.py | 10 | ||||
-rw-r--r-- | pylintrc | 1 |
3 files changed, 12 insertions, 13 deletions
diff --git a/install/tools/ipa-csreplica-manage b/install/tools/ipa-csreplica-manage index a0a61b540..2a2f2ae8a 100755 --- a/install/tools/ipa-csreplica-manage +++ b/install/tools/ipa-csreplica-manage @@ -190,9 +190,9 @@ def del_link(realm, replica1, replica2, dirman_passwd, force=False): # Find the DN of the replication agreement to remove replica2_dn = None - for e in repl_list: - if e.single_value.get('nsDS5ReplicaHost') == replica1: - replica2_dn = e.dn + for entry in repl_list: + if entry.single_value.get('nsDS5ReplicaHost') == replica1: + replica2_dn = entry.dn break # This should never happen @@ -203,8 +203,8 @@ def del_link(realm, replica1, replica2, dirman_passwd, force=False): print("'%s' has no replication agreement for '%s'" % (replica2, replica1)) if not force: return - except Exception as e: - print("Failed to get data from '%s': %s" % (replica2, e)) + except Exception as exc: + print("Failed to get data from '%s': %s" % (replica2, exc)) if not force: sys.exit(1) @@ -213,8 +213,8 @@ def del_link(realm, replica1, replica2, dirman_passwd, force=False): try: repl2.delete_agreement(replica1, replica2_dn) repl2.delete_referral(replica1, repl1.port) - except Exception as e: - print("Unable to remove agreement on %s: %s" % (replica2, e)) + except Exception as exc: + print("Unable to remove agreement on %s: %s" % (replica2, exc)) failed = True if failed: diff --git a/ipaserver/plugins/baseldap.py b/ipaserver/plugins/baseldap.py index 1df8da455..e2669ca23 100644 --- a/ipaserver/plugins/baseldap.py +++ b/ipaserver/plugins/baseldap.py @@ -2035,9 +2035,9 @@ class LDAPSearch(BaseLDAPCommand, crud.Search): entries.sort(key=sort_key) if not options.get('raw', False): - for e in entries: - self.obj.get_indirect_members(e, attrs_list) - self.obj.convert_attribute_members(e, *args, **options) + for entry in entries: + self.obj.get_indirect_members(entry, attrs_list) + self.obj.convert_attribute_members(entry, *args, **options) for (i, e) in enumerate(entries): entries[i] = entry_to_dict(e, **options) @@ -2051,9 +2051,9 @@ class LDAPSearch(BaseLDAPCommand, crud.Search): try: ldap.handle_truncated_result(truncated) - except errors.LimitsExceeded as e: + except errors.LimitsExceeded as exc: add_message(options['version'], result, SearchResultTruncated( - reason=e)) + reason=exc)) return result @@ -51,7 +51,6 @@ disable= no-init, pointless-string-statement, protected-access, - redefine-in-handler, redefined-builtin, redefined-outer-name, super-init-not-called, |