diff options
Diffstat (limited to 'ipalib')
| -rw-r--r-- | ipalib/parameters.py | 2 | ||||
| -rw-r--r-- | ipalib/plugins/dns.py | 2 | ||||
| -rw-r--r-- | ipalib/plugins/group.py | 2 | ||||
| -rw-r--r-- | ipalib/plugins/permission.py | 2 | ||||
| -rw-r--r-- | ipalib/plugins/pwpolicy.py | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/ipalib/parameters.py b/ipalib/parameters.py index 7b27b70c2..94bd018ca 100644 --- a/ipalib/parameters.py +++ b/ipalib/parameters.py @@ -203,7 +203,7 @@ class DefaultFrom(ReadOnly): ) self.callback = callback if len(keys) == 0: - fc = callback.func_code + fc = callback.__code__ if fc.co_flags & 0x0c: raise ValueError("callback: variable-length argument list not allowed") self.keys = fc.co_varnames[:fc.co_argcount] diff --git a/ipalib/plugins/dns.py b/ipalib/plugins/dns.py index 4376d83ce..23871a58f 100644 --- a/ipalib/plugins/dns.py +++ b/ipalib/plugins/dns.py @@ -3682,7 +3682,7 @@ class dnsrecord_add(LDAPCreate): return dn def exc_callback(self, keys, options, exc, call_func, *call_args, **call_kwargs): - if call_func.func_name == 'add_entry': + if call_func.__name__ == 'add_entry': if isinstance(exc, errors.DuplicateEntry): # A new record is being added to existing LDAP DNS object # Update can be safely run as old record values has been diff --git a/ipalib/plugins/group.py b/ipalib/plugins/group.py index 381693cf1..18ae6dc36 100644 --- a/ipalib/plugins/group.py +++ b/ipalib/plugins/group.py @@ -397,7 +397,7 @@ class group_mod(LDAPUpdate): def exc_callback(self, keys, options, exc, call_func, *call_args, **call_kwargs): # Check again for GID requirement in case someone tried to clear it # using --setattr. - if call_func.func_name == 'update_entry': + if call_func.__name__ == 'update_entry': if isinstance(exc, errors.ObjectclassViolation): if 'gidNumber' in exc.message and 'posixGroup' in exc.message: raise errors.RequirementError(name='gid') diff --git a/ipalib/plugins/permission.py b/ipalib/plugins/permission.py index 1c636d8c0..012b78fcc 100644 --- a/ipalib/plugins/permission.py +++ b/ipalib/plugins/permission.py @@ -1194,7 +1194,7 @@ class permission_mod(baseldap.LDAPUpdate): return dn def exc_callback(self, keys, options, exc, call_func, *call_args, **call_kwargs): - if call_func.func_name == 'update_entry': + if call_func.__name__ == 'update_entry': self._revert_aci() raise exc diff --git a/ipalib/plugins/pwpolicy.py b/ipalib/plugins/pwpolicy.py index cb8ef29ee..4425a921a 100644 --- a/ipalib/plugins/pwpolicy.py +++ b/ipalib/plugins/pwpolicy.py @@ -506,7 +506,7 @@ class pwpolicy_mod(LDAPUpdate): return dn def exc_callback(self, keys, options, exc, call_func, *call_args, **call_kwargs): - if call_func.func_name == 'update_entry': + if call_func.__name__ == 'update_entry': if isinstance(exc, errors.EmptyModlist): entry_attrs = call_args[0] cosupdate = getattr(context, 'cosupdate') |