IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2024-12-24 16:10:02 -06:00
Code Issues Packages Projects Releases Wiki Activity

Modernize function and method attribute names

Browse Source 
Python 3 uses double-underscored names for internal function attributes.
In Python 2.7, these names exist as aliases to the old 'func_*' and
'im_*' names.

Reviewed-By: Tomas Babej <tbabej@redhat.com>
This commit is contained in:
Petr Viktorin 2015-07-30 17:03:06 +02:00 committed by Tomas Babej
parent 27dabb4528
commit 8b88caa110
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ipalib/parameters.py
View File

@ -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]

2
ipalib/plugins/dns.py
View File

@ -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

2
ipalib/plugins/group.py
View File

@ -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')

2
ipalib/plugins/permission.py
View File

@ -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

2
ipalib/plugins/pwpolicy.py
View File

@ -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')

8
ipatests/test_ipalib/test_frontend.py
View File

@ -642,7 +642,7 @@ class test_Command(ClassChecker):
(api, home) = create_test_api(in_server=True)
api.finalize()
o = my_cmd(api)
assert o.run.im_func is self.cls.run.im_func
assert o.run.__func__ is self.cls.run.__func__
out = o.run(*args, **kw)
assert ('execute', args, kw) == out
@ -650,7 +650,7 @@ class test_Command(ClassChecker):
(api, home) = create_test_api(in_server=False)
api.finalize()
o = my_cmd(api)
assert o.run.im_func is self.cls.run.im_func
assert o.run.__func__ is self.cls.run.__func__
assert ('forward', args, kw) == o.run(*args, **kw)
def test_messages(self):
@ -682,14 +682,14 @@ class test_Command(ClassChecker):
(api, home) = create_test_api(in_server=True)
api.finalize()
o = my_cmd(api)
assert o.run.im_func is self.cls.run.im_func
assert o.run.__func__ is self.cls.run.__func__
assert {'name': 'execute', 'messages': expected} == o.run(*args, **kw)
# Test in non-server context
(api, home) = create_test_api(in_server=False)
api.finalize()
o = my_cmd(api)
assert o.run.im_func is self.cls.run.im_func
assert o.run.__func__ is self.cls.run.__func__
assert {'name': 'forward', 'messages': expected} == o.run(*args, **kw)
def test_validate_output_basic(self):