From 46e2fb0a58fc06cfce1bb535f432405767d6b78b Mon Sep 17 00:00:00 2001 From: Akihiro Motoki Date: Sat, 28 Jul 2018 01:47:42 +0900 Subject: [PATCH] Revert "Fixes a bug with issubclass() being called on an instance" This reverts commit e3d772050f3f4de6369b3dd1ba1269e2903666f7. "formatters" argument in get_dict_properties() and get_item_properties() expects a class of FormattableColumn instead of its instance. commit e3d772050f3f4de6369b3dd1ba1269e2903666f7 replaced issubclass() with isinstance() unexpectedly. As a result, osc-lib 1.11.0 breaks existing OSC plugin (at least neutronclient OSC plugin). Story: 2003133 Task: 23255 Change-Id: Ie10063197f02679e987e87cb4852f5230a02f76d --- osc_lib/utils/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osc_lib/utils/__init__.py b/osc_lib/utils/__init__.py index 051a660..d640ca8 100644 --- a/osc_lib/utils/__init__.py +++ b/osc_lib/utils/__init__.py @@ -430,7 +430,7 @@ def get_dict_properties(item, fields, mixed_case_fields=None, formatters=None): data = item[field_name] if field_name in item else '' if field in formatters: formatter = formatters[field] - if isinstance(formatter, cliff_columns.FormattableColumn): + if issubclass(formatter, cliff_columns.FormattableColumn): data = formatter(data) else: warnings.warn(