bn8/check_syncrepl_extended
1
0
Fork 0
Code Issues Pull requests Projects Releases 4 Wiki Activity Actions

Linting

Browse source 
Removed some redundant code that pylint-complaints about like `else` and
`elif` cases as suggest by Björn Zettergren <bjorn.zettergren@deltaprojects.com>
This commit is contained in:
Benjamin Renard 2021-03-23 17:40:04 +01:00
parent 36f9a09a34
commit 7153dfea86
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
check_syncrepl_extended
View file

@ -326,9 +326,9 @@ class LdapServer(object):
def get_scope(scope): def get_scope(scope):
if scope == 'base': if scope == 'base':
return ldap.SCOPE_BASE # pylint: disable=no-member return ldap.SCOPE_BASE # pylint: disable=no-member
elif scope == 'one': if scope == 'one':
return ldap.SCOPE_ONELEVEL # pylint: disable=no-member return ldap.SCOPE_ONELEVEL # pylint: disable=no-member
elif scope == 'sub': if scope == 'sub':
return ldap.SCOPE_SUBTREE # pylint: disable=no-member return ldap.SCOPE_SUBTREE # pylint: disable=no-member
raise Exception("Unknown LDAP scope '%s'" % scope) raise Exception("Unknown LDAP scope '%s'" % scope)
@ -344,9 +344,8 @@ class LdapServer(object):
res_type, res_data = self.con.result(res_id, 0) res_type, res_data = self.con.result(res_id, 0)
if res_data == []: if res_data == []:
break break
else: if res_type == ldap.RES_SEARCH_ENTRY: # pylint: disable=no-member
if res_type == ldap.RES_SEARCH_ENTRY: # pylint: disable=no-member ret.append(res_data)
ret.append(res_data)
return ret return ret
def paged_search(self, basedn, filterstr, attrs=None, scope=None): 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) logging.info('Restore original value of attribute "%s" of object "%s"', attr, dn)
if options.removetouchvalue and TOUCH_VALUE in old[attr]: if options.removetouchvalue and TOUCH_VALUE in old[attr]:
old[attr].remove(TOUCH_VALUE) old[attr].remove(TOUCH_VALUE)
self.update_object(dn, new, old) self.update_object(dn=dn, old=new, new=old)
return True return True
except LDAPError: except LDAPError:
logging.error('Error touching object "%s"', dn, exc_info=True) logging.error('Error touching object "%s"', dn, exc_info=True)