openstack/horizon
Code Issues Proposed changes

Merge "py3: Replace func.func_name with func.__name__"

Browse Source
This commit is contained in:
Jenkins 2015-08-22 06:58:50 +00:00 committed by Gerrit Code Review
commit 6705ef1db0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
horizon/tables/base.py
View File

@ -396,7 +396,7 @@ class Column(html.HTMLElement):
except Exception:
msg = ("Filter '%(filter)s' failed with data "
"'%(data)s' on column '%(col_name)s'")
args = {'filter': filter_func.func_name,
args = {'filter': filter_func.__name__,
'data': data,
'col_name': six.text_type(self.verbose_name)}
LOG.warning(msg, args)

4
openstack_dashboard/test/integration_tests/tests/decorators.py
View File

@ -91,7 +91,7 @@ def services_required(*req_services):
raise ValueError(NOT_TEST_OBJECT_ERROR_MSG)
skip_method = _mark_class_skipped
else:
if not _is_test_method_name(obj.func_name):
if not _is_test_method_name(obj.__name__):
raise ValueError(NOT_TEST_OBJECT_ERROR_MSG)
skip_method = _mark_method_skipped
# get available services from configuration
@ -125,7 +125,7 @@ def skip_because(**kwargs):
raise ValueError(NOT_TEST_OBJECT_ERROR_MSG)
skip_method = _mark_class_skipped
else:
if not _is_test_method_name(obj.func_name):
if not _is_test_method_name(obj.__name__):
raise ValueError(NOT_TEST_OBJECT_ERROR_MSG)
skip_method = _mark_method_skipped
bugs = kwargs.get("bugs")