Python 3: use __code__ instead of func_code

The former works with both Python 2 and 3.

Change-Id: Id2f6d313bf90777e02b20b7f6f4fb99e79e85aff
Blueprint: neutron-python3

diff --git a/neutron/db/db_base_plugin_common.py b/neutron/db/db_base_plugin_common.py
index b79ac10cb4397f4236376ddcaa8323e6e399e735..e1e39f5bb25a99b0a9e3bbf6aad28fec1af62f9c 100644 (file)
--- a/neutron/db/db_base_plugin_common.py
+++ b/neutron/db/db_base_plugin_common.py
@@ -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

diff --git a/neutron/plugins/cisco/l2device_plugin_base.py b/neutron/plugins/cisco/l2device_plugin_base.py
index 56fd91f199d4f035cc7b65259a8a0a86a1930e28..660e5f8d05e0187f908b540ccaaf4e16b5fa8400 100644 (file)
--- a/neutron/plugins/cisco/l2device_plugin_base.py
+++ b/neutron/plugins/cisco/l2device_plugin_base.py
@@ -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

diff --git a/tox.ini b/tox.ini
index 233f3fcfa924870c8c11f78041e233c79c19d847..c6a845aa4e2a0b955e5fdfa1a47743dbb62dee43 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -253,7 +253,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