Merging upstream version 2.17.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

14 files changed, 28 insertions, 59 deletions

diff --git a/test/units/playbook/role/test_include_role.py b/test/units/playbook/role/test_include_role.py
index aa97da1..97ce325 100644
--- a/test/units/playbook/role/test_include_role.py
+++ b/test/units/playbook/role/test_include_role.py
@@ -15,11 +15,9 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
-# Make coding more python3-ish
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from __future__ import annotations
 
-from units.compat import unittest
+import unittest
 from unittest.mock import patch
 
 from ansible.playbook import Play
@@ -94,13 +92,11 @@ class TestIncludeRole(unittest.TestCase):
             if isinstance(task, IncludeRole):
                 blocks, handlers = task.get_block_list(loader=self.loader)
                 for block in blocks:
-                    for t in self.flatten_tasks(block.block):
-                        yield t
+                    yield from self.flatten_tasks(block.block)
             elif isinstance(task, Task):
                 yield task
             else:
-                for t in self.flatten_tasks(task.block):
-                    yield t
+                yield from self.flatten_tasks(task.block)
 
     def get_tasks_vars(self, play, tasks):
         for task in self.flatten_tasks(tasks):
diff --git a/test/units/playbook/role/test_role.py b/test/units/playbook/role/test_role.py
index 9d6b0ed..cbfe776 100644
--- a/test/units/playbook/role/test_role.py
+++ b/test/units/playbook/role/test_role.py
@@ -15,15 +15,13 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
-# Make coding more python3-ish
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from __future__ import annotations
 
 from collections.abc import Container
 
 import pytest
 
-from units.compat import unittest
+import unittest
 from unittest.mock import patch, MagicMock
 
 from ansible.errors import AnsibleParserError
diff --git a/test/units/playbook/test_attribute.py b/test/units/playbook/test_attribute.py
index bdb37c1..14c4807 100644
--- a/test/units/playbook/test_attribute.py
+++ b/test/units/playbook/test_attribute.py
@@ -15,10 +15,9 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from __future__ import annotations
 
-from units.compat import unittest
+import unittest
 from ansible.playbook.attribute import Attribute
 
 
diff --git a/test/units/playbook/test_base.py b/test/units/playbook/test_base.py
index bedd96a..de0c7ed 100644
--- a/test/units/playbook/test_base.py
+++ b/test/units/playbook/test_base.py
@@ -15,14 +15,11 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
-# Make coding more python3-ish
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from __future__ import annotations
 
-from units.compat import unittest
+import unittest
 
 from ansible.errors import AnsibleParserError, AnsibleAssertionError
-from ansible.module_utils.six import string_types
 from ansible.playbook.attribute import FieldAttribute, NonInheritableFieldAttribute
 from ansible.template import Templar
 from ansible.playbook import base
@@ -336,9 +333,9 @@ class BaseSubClass(base.Base):
     test_attr_bool = FieldAttribute(isa='bool', always_post_validate=True)
     test_attr_int = FieldAttribute(isa='int', always_post_validate=True)
     test_attr_float = FieldAttribute(isa='float', default=3.14159, always_post_validate=True)
-    test_attr_list = FieldAttribute(isa='list', listof=string_types, always_post_validate=True)
+    test_attr_list = FieldAttribute(isa='list', listof=(str,), always_post_validate=True)
     test_attr_list_no_listof = FieldAttribute(isa='list', always_post_validate=True)
-    test_attr_list_required = FieldAttribute(isa='list', listof=string_types, required=True,
+    test_attr_list_required = FieldAttribute(isa='list', listof=(str,), required=True,
                                              default=list, always_post_validate=True)
     test_attr_string = FieldAttribute(isa='string', default='the_test_attr_string_default_value')
     test_attr_string_required = FieldAttribute(isa='string', required=True,
diff --git a/test/units/playbook/test_block.py b/test/units/playbook/test_block.py
index 4847123..aac5f71 100644
--- a/test/units/playbook/test_block.py
+++ b/test/units/playbook/test_block.py
@@ -15,11 +15,9 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
-# Make coding more python3-ish
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from __future__ import annotations
 
-from units.compat import unittest
+import unittest
 from ansible.playbook.block import Block
 from ansible.playbook.task import Task
 
diff --git a/test/units/playbook/test_collectionsearch.py b/test/units/playbook/test_collectionsearch.py
index d16541b..f91d632 100644
--- a/test/units/playbook/test_collectionsearch.py
+++ b/test/units/playbook/test_collectionsearch.py
@@ -15,8 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from __future__ import annotations
 
 from ansible.errors import AnsibleParserError
 from ansible.playbook.play import Play
diff --git a/test/units/playbook/test_conditional.py b/test/units/playbook/test_conditional.py
index 8231d16..e0f0857 100644
--- a/test/units/playbook/test_conditional.py
+++ b/test/units/playbook/test_conditional.py
@@ -1,7 +1,6 @@
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from __future__ import annotations
 
-from units.compat import unittest
+import unittest
 from units.mock.loader import DictDataLoader
 from unittest.mock import MagicMock
 
diff --git a/test/units/playbook/test_helpers.py b/test/units/playbook/test_helpers.py
index 23385c0..2977b0d 100644
--- a/test/units/playbook/test_helpers.py
+++ b/test/units/playbook/test_helpers.py
@@ -15,13 +15,11 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
-# Make coding more python3-ish
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from __future__ import annotations
 
 import os
 
-from units.compat import unittest
+import unittest
 from unittest.mock import MagicMock
 from units.mock.loader import DictDataLoader
 
diff --git a/test/units/playbook/test_included_file.py b/test/units/playbook/test_included_file.py
index c7a66b0..7d1e707 100644
--- a/test/units/playbook/test_included_file.py
+++ b/test/units/playbook/test_included_file.py
@@ -15,9 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
-# Make coding more python3-ish
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from __future__ import annotations
 
 import os
 
@@ -318,9 +316,6 @@ def test_empty_raw_params():
 
     task_ds_list = [
         {
-            'include': ''
-        },
-        {
             'include_tasks': ''
         },
         {
diff --git a/test/units/playbook/test_play.py b/test/units/playbook/test_play.py
index bcc1e5e..a54b93d 100644
--- a/test/units/playbook/test_play.py
+++ b/test/units/playbook/test_play.py
@@ -15,9 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
-# Make coding more python3-ish
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from __future__ import annotations
 
 import pytest
 
diff --git a/test/units/playbook/test_play_context.py b/test/units/playbook/test_play_context.py
index 7461b45..485a0e5 100644
--- a/test/units/playbook/test_play_context.py
+++ b/test/units/playbook/test_play_context.py
@@ -3,9 +3,7 @@
 #
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
-# Make coding more python3-ish
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from __future__ import annotations
 
 import pytest
 
diff --git a/test/units/playbook/test_playbook.py b/test/units/playbook/test_playbook.py
index 68a9fb7..c04479b 100644
--- a/test/units/playbook/test_playbook.py
+++ b/test/units/playbook/test_playbook.py
@@ -15,11 +15,9 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
-# Make coding more python3-ish
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from __future__ import annotations
 
-from units.compat import unittest
+import unittest
 from ansible.errors import AnsibleParserError
 from ansible.playbook import Playbook
 from ansible.vars.manager import VariableManager
diff --git a/test/units/playbook/test_taggable.py b/test/units/playbook/test_taggable.py
index c6ce35d..7076f98 100644
--- a/test/units/playbook/test_taggable.py
+++ b/test/units/playbook/test_taggable.py
@@ -15,11 +15,9 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
-# Make coding more python3-ish
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from __future__ import annotations
 
-from units.compat import unittest
+import unittest
 from ansible.playbook.taggable import Taggable
 from units.mock.loader import DictDataLoader
 
diff --git a/test/units/playbook/test_task.py b/test/units/playbook/test_task.py
index e28d2ec..6eb3bf2 100644
--- a/test/units/playbook/test_task.py
+++ b/test/units/playbook/test_task.py
@@ -15,11 +15,9 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
-# Make coding more python3-ish
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from __future__ import annotations
 
-from units.compat import unittest
+import unittest
 from unittest.mock import patch
 from ansible.playbook.task import Task
 from ansible.plugins.loader import init_plugin_loader