From 7153dfea869796eec65272e5689b581a667efb76 Mon Sep 17 00:00:00 2001 From: Benjamin Renard Date: Tue, 23 Mar 2021 17:40:04 +0100 Subject: [PATCH] Linting MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Removed some redundant code that pylint-complaints about like `else` and `elif` cases as suggest by Björn Zettergren --- check_syncrepl_extended | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/check_syncrepl_extended b/check_syncrepl_extended index 2a2a5a9..9bede37 100755 --- a/check_syncrepl_extended +++ b/check_syncrepl_extended @@ -326,9 +326,9 @@ class LdapServer(object): def get_scope(scope): if scope == 'base': return ldap.SCOPE_BASE # pylint: disable=no-member - elif scope == 'one': + if scope == 'one': return ldap.SCOPE_ONELEVEL # pylint: disable=no-member - elif scope == 'sub': + if scope == 'sub': return ldap.SCOPE_SUBTREE # pylint: disable=no-member raise Exception("Unknown LDAP scope '%s'" % scope) @@ -344,9 +344,8 @@ class LdapServer(object): res_type, res_data = self.con.result(res_id, 0) if res_data == []: break - else: - if res_type == ldap.RES_SEARCH_ENTRY: # pylint: disable=no-member - ret.append(res_data) + if res_type == ldap.RES_SEARCH_ENTRY: # pylint: disable=no-member + ret.append(res_data) return ret def paged_search(self, basedn, filterstr, attrs=None, scope=None): @@ -411,7 +410,7 @@ class LdapServer(object): logging.info('Restore original value of attribute "%s" of object "%s"', attr, dn) if options.removetouchvalue and TOUCH_VALUE in old[attr]: old[attr].remove(TOUCH_VALUE) - self.update_object(dn, new, old) + self.update_object(dn=dn, old=new, new=old) return True except LDAPError: logging.error('Error touching object "%s"', dn, exc_info=True)