Merge "Python 3: use __code__ instead of func_code"
This commit is contained in:
commit
9274277ff4
@ -50,7 +50,7 @@ def filter_fields(f):
|
||||
fields = kwargs.get('fields')
|
||||
if not fields:
|
||||
try:
|
||||
pos = f.func_code.co_varnames.index('fields')
|
||||
pos = f.__code__.co_varnames.index('fields')
|
||||
fields = args[pos]
|
||||
except (IndexError, ValueError):
|
||||
return result
|
||||
|
@ -160,9 +160,9 @@ class L2DevicePluginBase(object):
|
||||
fn_obj = base.__dict__[method]
|
||||
if inspect.isfunction(fn_obj):
|
||||
abstract_fn_obj = cls.__dict__[method]
|
||||
arg_count = fn_obj.func_code.co_argcount
|
||||
arg_count = fn_obj.__code__.co_argcount
|
||||
expected_arg_count = \
|
||||
abstract_fn_obj.func_code.co_argcount
|
||||
abstract_fn_obj.__code__.co_argcount
|
||||
method_ok = arg_count == expected_arg_count
|
||||
if method_ok:
|
||||
continue
|
||||
|
3
tox.ini
3
tox.ini
@ -254,7 +254,8 @@ commands = python -m testtools.run \
|
||||
neutron.tests.unit.ipam.test_requests \
|
||||
neutron.tests.unit.notifiers.test_nova \
|
||||
neutron.tests.unit.notifiers.test_batch_notifier \
|
||||
neutron.tests.unit.api.test_extensions
|
||||
neutron.tests.unit.api.test_extensions \
|
||||
neutron.tests.unit.db.test_db_base_plugin_common
|
||||
|
||||
[flake8]
|
||||
# E125 continuation line does not distinguish itself from next logical line
|
||||
|
Loading…
x
Reference in New Issue
Block a user