From caec2b9d29932a425cdda6d034bfb36dd4371343 Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Tue, 26 Oct 2021 15:29:34 -0700 Subject: [PATCH] Revert "Revert AnsibleCollectionConfig Py3 only change (#76104)" This reverts commit 04e30d900210fc58e20fa9425a33d03dd27f13c3. --- lib/ansible/utils/collection_loader/_collection_config.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/ansible/utils/collection_loader/_collection_config.py b/lib/ansible/utils/collection_loader/_collection_config.py index a20319319ce..49de68b135e 100644 --- a/lib/ansible/utils/collection_loader/_collection_config.py +++ b/lib/ansible/utils/collection_loader/_collection_config.py @@ -13,7 +13,6 @@ 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: @@ -103,5 +102,5 @@ class _AnsibleCollectionConfig(type): # concrete class of our metaclass type that defines the class properties we want -class AnsibleCollectionConfig(with_metaclass(_AnsibleCollectionConfig)): +class AnsibleCollectionConfig(metaclass=_AnsibleCollectionConfig): pass