Remove py27 compat files & update imports for patch & magicmock (#480)

* remove compat files & imports

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

.github/workflows/tests.yml

@@ -45,5 +45,5 @@ jobs:
           '${{ needs.sanity.result }}',
           '${{ needs.unit-galaxy.result }}',
           '${{ needs.ansible-lint.result }}',
-          '${{ needs.unit-source.outputs.result }}'
+          '${{ needs.unit-source.result }}'
           ])"

changelogs/fragments/trivial_tests_updates.yaml

@@ -0,0 +1,4 @@
+---
+trivial:
+  - remove compat files as we stopped testing against python 2.7.
+  - update direct imports for patch and MagicMock from unittest.

tests/unit/mock/path.py

@@ -2,9 +2,9 @@
 
 
 __metaclass__ = type
-from ansible.utils.path import unfrackpath
+from unittest.mock import MagicMock
 
-from ansible_collections.cisco.iosxr.tests.unit.compat.mock import MagicMock
+from ansible.utils.path import unfrackpath
 
 
 mock_unfrackpath_noop = MagicMock(

tests/unit/modules/network/iosxr/test_hostname.py

@@ -23,9 +23,9 @@
 __metaclass__ = type
 
 from textwrap import dedent
+from unittest.mock import patch
 
 from ansible_collections.cisco.iosxr.plugins.modules import iosxr_hostname
-from ansible_collections.cisco.iosxr.tests.unit.compat.mock import patch
 from ansible_collections.cisco.iosxr.tests.unit.modules.utils import set_module_args
 
 from .iosxr_module import TestIosxrModule

tests/unit/modules/network/iosxr/test_iosxr.py

@@ -22,15 +22,15 @@
 __metaclass__ = type
 
 from os import path
+from unittest import TestCase
 
 from ansible.module_utils._text import to_bytes, to_text
 from mock import MagicMock
 
 from ansible_collections.cisco.iosxr.plugins.cliconf import iosxr
-from ansible_collections.cisco.iosxr.tests.unit.compat import unittest
 
 
-class TestPluginCLIConfIOSXR(unittest.TestCase):
+class TestPluginCLIConfIOSXR(TestCase):
     """Test class for IOSXR CLI Conf Methods"""
 
     def setUp(self):

tests/unit/modules/network/iosxr/test_iosxr_acl_interfaces.py

@@ -22,8 +22,9 @@
 
 __metaclass__ = type
 
+from unittest.mock import patch
+
 from ansible_collections.cisco.iosxr.plugins.modules import iosxr_acl_interfaces
-from ansible_collections.cisco.iosxr.tests.unit.compat.mock import patch
 from ansible_collections.cisco.iosxr.tests.unit.modules.utils import set_module_args
 
 from .iosxr_module import TestIosxrModule, load_fixture

tests/unit/modules/network/iosxr/test_iosxr_acls.py

@@ -8,8 +8,9 @@
 
 __metaclass__ = type
 
+from unittest.mock import patch
+
 from ansible_collections.cisco.iosxr.plugins.modules import iosxr_acls
-from ansible_collections.cisco.iosxr.tests.unit.compat.mock import patch
 from ansible_collections.cisco.iosxr.tests.unit.modules.utils import set_module_args
 
 from .iosxr_module import TestIosxrModule, load_fixture

tests/unit/modules/network/iosxr/test_iosxr_banner.py

@@ -38,9 +38,9 @@
 
 
 __metaclass__ = type
+from unittest.mock import patch
 
 from ansible_collections.cisco.iosxr.plugins.modules import iosxr_banner
-from ansible_collections.cisco.iosxr.tests.unit.compat.mock import patch
 from ansible_collections.cisco.iosxr.tests.unit.modules.utils import set_module_args
 
 from .iosxr_module import TestIosxrModule, load_fixture

tests/unit/modules/network/iosxr/test_iosxr_bgp_address_family.py

@@ -23,9 +23,9 @@
 __metaclass__ = type
 
 from textwrap import dedent
+from unittest.mock import patch
 
 from ansible_collections.cisco.iosxr.plugins.modules import iosxr_bgp_address_family
-from ansible_collections.cisco.iosxr.tests.unit.compat.mock import patch
 from ansible_collections.cisco.iosxr.tests.unit.modules.utils import set_module_args
 
 from .iosxr_module import TestIosxrModule

tests/unit/modules/network/iosxr/test_iosxr_bgp_global.py

@@ -23,9 +23,9 @@
 __metaclass__ = type
 
 from textwrap import dedent
+from unittest.mock import patch
 
 from ansible_collections.cisco.iosxr.plugins.modules import iosxr_bgp_global
-from ansible_collections.cisco.iosxr.tests.unit.compat.mock import patch
 from ansible_collections.cisco.iosxr.tests.unit.modules.utils import set_module_args
 
 from .iosxr_module import TestIosxrModule

tests/unit/modules/network/iosxr/test_iosxr_bgp_neighbor_address_family.py

@@ -23,9 +23,9 @@
 __metaclass__ = type
 
 from textwrap import dedent
+from unittest.mock import patch
 
 from ansible_collections.cisco.iosxr.plugins.modules import iosxr_bgp_neighbor_address_family
-from ansible_collections.cisco.iosxr.tests.unit.compat.mock import patch
 from ansible_collections.cisco.iosxr.tests.unit.modules.utils import set_module_args
 
 from .iosxr_module import TestIosxrModule

tests/unit/modules/network/iosxr/test_iosxr_bgp_templates.py

@@ -23,9 +23,9 @@
 __metaclass__ = type
 
 from textwrap import dedent
+from unittest.mock import patch
 
 from ansible_collections.cisco.iosxr.plugins.modules import iosxr_bgp_templates
-from ansible_collections.cisco.iosxr.tests.unit.compat.mock import patch
 from ansible_collections.cisco.iosxr.tests.unit.modules.utils import set_module_args
 
 from .iosxr_module import TestIosxrModule

tests/unit/modules/network/iosxr/test_iosxr_command.py

@@ -21,8 +21,9 @@
 
 __metaclass__ = type
 
+from unittest.mock import patch
+
 from ansible_collections.cisco.iosxr.plugins.modules import iosxr_command
-from ansible_collections.cisco.iosxr.tests.unit.compat.mock import patch
 from ansible_collections.cisco.iosxr.tests.unit.modules.utils import set_module_args
 
 from .iosxr_module import TestIosxrModule, load_fixture

tests/unit/modules/network/iosxr/test_iosxr_config.py

@@ -21,10 +21,10 @@
 
 
 __metaclass__ = type
+from unittest.mock import MagicMock, patch
 
 from ansible_collections.cisco.iosxr.plugins.cliconf.iosxr import Cliconf
 from ansible_collections.cisco.iosxr.plugins.modules import iosxr_config
-from ansible_collections.cisco.iosxr.tests.unit.compat.mock import MagicMock, patch
 from ansible_collections.cisco.iosxr.tests.unit.modules.utils import set_module_args
 
 from .iosxr_module import TestIosxrModule, load_fixture

tests/unit/modules/network/iosxr/test_iosxr_facts.py

@@ -23,8 +23,9 @@
 
 import json
 
+from unittest.mock import patch
+
 from ansible_collections.cisco.iosxr.plugins.modules import iosxr_facts
-from ansible_collections.cisco.iosxr.tests.unit.compat.mock import patch
 from ansible_collections.cisco.iosxr.tests.unit.modules.utils import set_module_args
 
 from .iosxr_module import TestIosxrModule, load_fixture

tests/unit/modules/network/iosxr/test_iosxr_interfaces.py

@@ -22,8 +22,9 @@
 
 __metaclass__ = type
 
+from unittest.mock import patch
+
 from ansible_collections.cisco.iosxr.plugins.modules import iosxr_interfaces
-from ansible_collections.cisco.iosxr.tests.unit.compat.mock import patch
 from ansible_collections.cisco.iosxr.tests.unit.modules.utils import set_module_args
 
 from .iosxr_module import TestIosxrModule, load_fixture

tests/unit/modules/network/iosxr/test_iosxr_l2_interfaces.py

@@ -22,8 +22,9 @@
 
 __metaclass__ = type
 
+from unittest.mock import patch
+
 from ansible_collections.cisco.iosxr.plugins.modules import iosxr_l2_interfaces
-from ansible_collections.cisco.iosxr.tests.unit.compat.mock import patch
 from ansible_collections.cisco.iosxr.tests.unit.modules.utils import set_module_args
 
 from .iosxr_module import TestIosxrModule, load_fixture

tests/unit/modules/network/iosxr/test_iosxr_l3_interfaces.py

@@ -22,8 +22,9 @@
 
 __metaclass__ = type
 
+from unittest.mock import patch
+
 from ansible_collections.cisco.iosxr.plugins.modules import iosxr_l3_interfaces
-from ansible_collections.cisco.iosxr.tests.unit.compat.mock import patch
 from ansible_collections.cisco.iosxr.tests.unit.modules.utils import set_module_args
 
 from .iosxr_module import TestIosxrModule, load_fixture

tests/unit/modules/network/iosxr/test_iosxr_lacp.py

@@ -22,8 +22,9 @@
 
 __metaclass__ = type
 
+from unittest.mock import patch
+
 from ansible_collections.cisco.iosxr.plugins.modules import iosxr_lacp
-from ansible_collections.cisco.iosxr.tests.unit.compat.mock import patch
 from ansible_collections.cisco.iosxr.tests.unit.modules.utils import set_module_args
 
 from .iosxr_module import TestIosxrModule, load_fixture

tests/unit/modules/network/iosxr/test_iosxr_lacp_interfaces.py

@@ -22,8 +22,9 @@
 
 __metaclass__ = type
 
+from unittest.mock import patch
+
 from ansible_collections.cisco.iosxr.plugins.modules import iosxr_lacp_interfaces
-from ansible_collections.cisco.iosxr.tests.unit.compat.mock import patch
 from ansible_collections.cisco.iosxr.tests.unit.modules.utils import set_module_args
 
 from .iosxr_module import TestIosxrModule, load_fixture