diff --git a/plugins/callback/cgroup_perf_recap.py b/plugins/callback/cgroup_perf_recap.py index 6721a03..58a4f37 100644 --- a/plugins/callback/cgroup_perf_recap.py +++ b/plugins/callback/cgroup_perf_recap.py @@ -141,8 +141,7 @@ from abc import ABCMeta, abstractmethod from functools import partial -from ansible.module_utils._text import to_bytes, to_text -from ansible.module_utils.six import with_metaclass +from ansible.module_utils.common.text.converters import to_bytes, to_text from ansible.parsing.ajson import AnsibleJSONEncoder from ansible.plugins.callback import CallbackBase @@ -158,7 +157,7 @@ def dict_fromkeys(keys, default=None): return d -class BaseProf(with_metaclass(ABCMeta, threading.Thread)): +class BaseProf(threading.Thread, metaclass=ABCMeta): def __init__(self, path, obj=None, writer=None): threading.Thread.__init__(self) # pylint: disable=non-parent-init-called self.obj = obj diff --git a/tests/sanity/ignore-2.21.txt b/tests/sanity/ignore-2.21.txt index 2abdfc0..a261578 100644 --- a/tests/sanity/ignore-2.21.txt +++ b/tests/sanity/ignore-2.21.txt @@ -1,5 +1,4 @@ tests/utils/shippable/timing.py shebang -plugins/callback/cgroup_perf_recap.py pylint:ansible-bad-import-from plugins/modules/sysctl.py pylint:ansible-bad-import-from plugins/shell/csh.py pylint:ansible-bad-import-from plugins/shell/fish.py pylint:ansible-bad-import-from