From 04e30d900210fc58e20fa9425a33d03dd27f13c3 Mon Sep 17 00:00:00 2001 From: Martin Krizek Date: Thu, 21 Oct 2021 15:07:23 +0200 Subject: [PATCH] Revert AnsibleCollectionConfig Py3 only change (#76104) --- lib/ansible/utils/collection_loader/_collection_config.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/ansible/utils/collection_loader/_collection_config.py b/lib/ansible/utils/collection_loader/_collection_config.py index 49de68b135e..a20319319ce 100644 --- a/lib/ansible/utils/collection_loader/_collection_config.py +++ b/lib/ansible/utils/collection_loader/_collection_config.py @@ -13,6 +13,7 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type from ansible.module_utils.common.text.converters import to_text +from ansible.module_utils.six import with_metaclass class _EventSource: @@ -102,5 +103,5 @@ class _AnsibleCollectionConfig(type): # concrete class of our metaclass type that defines the class properties we want -class AnsibleCollectionConfig(metaclass=_AnsibleCollectionConfig): +class AnsibleCollectionConfig(with_metaclass(_AnsibleCollectionConfig)): pass