diff options
Diffstat (limited to 'ipaserver/plugins')
| -rw-r--r-- | ipaserver/plugins/config.py | 4 | ||||
| -rw-r--r-- | ipaserver/plugins/domainlevel.py | 2 | ||||
| -rw-r--r-- | ipaserver/plugins/group.py | 2 | ||||
| -rw-r--r-- | ipaserver/plugins/hbactest.py | 3 | ||||
| -rw-r--r-- | ipaserver/plugins/host.py | 2 | ||||
| -rw-r--r-- | ipaserver/plugins/privilege.py | 2 | ||||
| -rw-r--r-- | ipaserver/plugins/selinuxusermap.py | 2 | ||||
| -rw-r--r-- | ipaserver/plugins/server.py | 2 | ||||
| -rw-r--r-- | ipaserver/plugins/service.py | 2 | ||||
| -rw-r--r-- | ipaserver/plugins/sudocmd.py | 2 |
10 files changed, 12 insertions, 11 deletions
diff --git a/ipaserver/plugins/config.py b/ipaserver/plugins/config.py index 95bbb49cc..6407fcc3b 100644 --- a/ipaserver/plugins/config.py +++ b/ipaserver/plugins/config.py @@ -293,7 +293,7 @@ class config_mod(LDAPUpdate): for field in entry_attrs[k].split(',')] # test if all base types (without sub-types) are allowed for a in attributes: - a, tomato, olive = a.partition(';') + a, _dummy, _dummy = a.partition(';') if a not in allowed_attrs: raise errors.ValidationError( name=k, error=_('attribute "%s" not allowed') % a @@ -325,7 +325,7 @@ class config_mod(LDAPUpdate): if self.api.Object[obj].uuid_attribute: checked_attrs = checked_attrs + [self.api.Object[obj].uuid_attribute] for obj_attr in checked_attrs: - obj_attr, tomato, olive = obj_attr.partition(';') + obj_attr, _dummy, _dummy = obj_attr.partition(';') if obj_attr in OPERATIONAL_ATTRIBUTES: continue if obj_attr in self.api.Object[obj].params and \ diff --git a/ipaserver/plugins/domainlevel.py b/ipaserver/plugins/domainlevel.py index 23fa2a1b2..42603d71a 100644 --- a/ipaserver/plugins/domainlevel.py +++ b/ipaserver/plugins/domainlevel.py @@ -60,7 +60,7 @@ def get_master_entries(ldap, api): api.env.basedn ) - masters, _ = ldap.find_entries( + masters, _dummy = ldap.find_entries( filter="(cn=*)", base_dn=container_masters, scope=ldap.SCOPE_ONELEVEL, diff --git a/ipaserver/plugins/group.py b/ipaserver/plugins/group.py index 115db9d16..f48a985cf 100644 --- a/ipaserver/plugins/group.py +++ b/ipaserver/plugins/group.py @@ -329,7 +329,7 @@ class group_del(LDAPDelete): assert isinstance(dn, DN) config = ldap.get_ipa_config() def_primary_group = config.get('ipadefaultprimarygroup', '') - def_primary_group_dn = group_dn = self.obj.get_dn(def_primary_group) + def_primary_group_dn = self.obj.get_dn(def_primary_group) if dn == def_primary_group_dn: raise errors.DefaultGroupError() group_attrs = self.obj.methods.show( diff --git a/ipaserver/plugins/hbactest.py b/ipaserver/plugins/hbactest.py index 90f3b561a..626e89424 100644 --- a/ipaserver/plugins/hbactest.py +++ b/ipaserver/plugins/hbactest.py @@ -411,7 +411,8 @@ class hbactest(Command): ldap = self.api.Backend.ldap2 group_container = DN(api.env.container_group, api.env.basedn) try: - entries, truncated = ldap.find_entries(filter_sids, ['memberof'], group_container) + entries, _truncated = ldap.find_entries( + filter_sids, ['memberof'], group_container) except errors.NotFound: request.user.groups = [] else: diff --git a/ipaserver/plugins/host.py b/ipaserver/plugins/host.py index 6da1afb42..957a1edcf 100644 --- a/ipaserver/plugins/host.py +++ b/ipaserver/plugins/host.py @@ -601,7 +601,7 @@ class host(LDAPObject): managed_hosts = [] try: - (hosts, truncated) = ldap.find_entries( + (hosts, _truncated) = ldap.find_entries( base_dn=DN(self.container_dn, api.env.basedn), filter=host_filter, attrs_list=host_attrs) diff --git a/ipaserver/plugins/privilege.py b/ipaserver/plugins/privilege.py index b46807c3f..b3afbd289 100644 --- a/ipaserver/plugins/privilege.py +++ b/ipaserver/plugins/privilege.py @@ -64,7 +64,7 @@ def validate_permission_to_privilege(api, permission): '(objectClass=ipaPermissionV2)', '(!(ipaPermBindRuleType=permission))', ldap.make_filter_from_attr('cn', permission, rules='|')]) try: - entries, truncated = ldap.find_entries( + entries, _truncated = ldap.find_entries( filter=ldapfilter, attrs_list=['cn', 'ipapermbindruletype'], base_dn=DN(api.env.container_permission, api.env.basedn), diff --git a/ipaserver/plugins/selinuxusermap.py b/ipaserver/plugins/selinuxusermap.py index 8f660d089..bb48a5af3 100644 --- a/ipaserver/plugins/selinuxusermap.py +++ b/ipaserver/plugins/selinuxusermap.py @@ -109,7 +109,7 @@ def validate_selinuxuser(ugettext, user): # If we add in ::: we don't have to check to see if some values are # empty - (name, mls, mcs, ignore) = (user + ':::').split(':', 3) + (name, mls, mcs, _ignore) = (user + ':::').split(':', 3) if not regex_name.match(name): return _('Invalid SELinux user name, only a-Z and _ are allowed') diff --git a/ipaserver/plugins/server.py b/ipaserver/plugins/server.py index a3d69a017..ec71dbcc3 100644 --- a/ipaserver/plugins/server.py +++ b/ipaserver/plugins/server.py @@ -889,7 +889,7 @@ class server_conncheck(crud.PKQuery): follow_name_owner_changes=True) server = dbus.Interface(obj, 'org.freeipa.server') - ret, stdout, stderr = server.conncheck(keys[-1]) + ret, stdout, _stderr = server.conncheck(keys[-1]) result = dict( result=(ret == 0), diff --git a/ipaserver/plugins/service.py b/ipaserver/plugins/service.py index c05907324..e57ca523a 100644 --- a/ipaserver/plugins/service.py +++ b/ipaserver/plugins/service.py @@ -284,7 +284,7 @@ def check_required_principal(ldap, principal): """ try: host_is_master(ldap, principal.hostname) - except errors.ValidationError as e: + except errors.ValidationError: service_types = ['HTTP', 'ldap', 'DNS', 'dogtagldap'] if principal.service_name in service_types: raise errors.ValidationError(name='principal', error=_('This principal is required by the IPA master')) diff --git a/ipaserver/plugins/sudocmd.py b/ipaserver/plugins/sudocmd.py index e3ae33a84..b198c5829 100644 --- a/ipaserver/plugins/sudocmd.py +++ b/ipaserver/plugins/sudocmd.py @@ -164,7 +164,7 @@ class sudocmd_del(LDAPDelete): ldap.MATCH_ALL) dependent_sudorules = [] try: - entries, truncated = ldap.find_entries( + entries, _truncated = ldap.find_entries( filter, ['cn'], base_dn=DN(api.env.container_sudorule, api.env.basedn)) except errors.NotFound: |