collection 교체

collection/ansible/netcommon/tests/unit/mock/loader.py

@@ -1,36 +1,24 @@
 # (c) 2012-2014, Michael DeHaan <michael.dehaan@gmail.com>
-#
-# This file is part of Ansible
-#
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 # Make coding more python3-ish
 from __future__ import absolute_import, division, print_function
 
+
 __metaclass__ = type
 
 import os
 
 from ansible.errors import AnsibleParserError
-from ansible.parsing.dataloader import DataLoader
 from ansible.module_utils._text import to_bytes, to_text
+from ansible.parsing.dataloader import DataLoader
 
 
 class DictDataLoader(DataLoader):
     def __init__(self, file_mapping=None):
         file_mapping = {} if file_mapping is None else file_mapping
-        assert type(file_mapping) == dict
+        assert isinstance(file_mapping, dict)
 
         super(DictDataLoader, self).__init__()
 

collection/ansible/netcommon/tests/unit/mock/path.py

@@ -1,12 +1,10 @@
 from __future__ import absolute_import, division, print_function
 
+
 __metaclass__ = type
-from ansible_collections.ansible.netcommon.tests.unit.compat.mock import (
-    MagicMock,
-)
+from unittest.mock import MagicMock
+
 from ansible.utils.path import unfrackpath
 
 
-mock_unfrackpath_noop = MagicMock(
-    spec_set=unfrackpath, side_effect=lambda x, *args, **kwargs: x
-)
+mock_unfrackpath_noop = MagicMock(spec_set=unfrackpath, side_effect=lambda x, *args, **kwargs: x)

collection/ansible/netcommon/tests/unit/mock/procenv.py

@@ -1,34 +1,23 @@
 # (c) 2016, Matt Davis <mdavis@ansible.com>
 # (c) 2016, Toshio Kuratomi <tkuratomi@ansible.com>
-#
-# This file is part of Ansible
-#
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 # Make coding more python3-ish
 from __future__ import absolute_import, division, print_function
 
+
 __metaclass__ = type
 
-import sys
 import json
+import sys
+import unittest
 
 from contextlib import contextmanager
 from io import BytesIO, StringIO
-from ansible_collections.ansible.netcommon.tests.unit.compat import unittest
-from ansible.module_utils.six import PY3
+
 from ansible.module_utils._text import to_bytes
+from ansible.module_utils.six import PY3
 
 
 @contextmanager

collection/ansible/netcommon/tests/unit/mock/vault_helper.py

@@ -14,10 +14,10 @@
 # Make coding more python3-ish
 from __future__ import absolute_import, division, print_function
 
+
 __metaclass__ = type
 
 from ansible.module_utils._text import to_bytes
-
 from ansible.parsing.vault import VaultSecret
 
 
@@ -37,6 +37,4 @@ class TextVaultSecret(VaultSecret):
     @property
     def bytes(self):
         """The text encoded with encoding, unless we specifically set _bytes."""
-        return self._bytes or to_bytes(
-            self.text, encoding=self.encoding, errors=self.errors
-        )
+        return self._bytes or to_bytes(self.text, encoding=self.encoding, errors=self.errors)

collection/ansible/netcommon/tests/unit/mock/yaml_helper.py

@@ -1,12 +1,14 @@
 from __future__ import absolute_import, division, print_function
 
+
 __metaclass__ = type
 import io
+
 import yaml
 
 from ansible.module_utils.six import PY3
-from ansible.parsing.yaml.loader import AnsibleLoader
 from ansible.parsing.yaml.dumper import AnsibleDumper
+from ansible.parsing.yaml.loader import AnsibleLoader
 
 
 class YamlTestUtils(object):
@@ -15,7 +17,8 @@ class YamlTestUtils(object):
     def _loader(self, stream):
         """Vault related tests will want to override this.
 
-        Vault cases should setup a AnsibleLoader that has the vault password."""
+        Vault cases should setup a AnsibleLoader that has the vault password.
+        """
         return AnsibleLoader(stream)
 
     def _dump_stream(self, obj, stream, dumper=None):
@@ -44,9 +47,7 @@ class YamlTestUtils(object):
         obj_2 = loader.get_data()
 
         # dump the gen 2 objects directory to strings
-        string_from_object_dump_2 = self._dump_string(
-            obj_2, dumper=AnsibleDumper
-        )
+        string_from_object_dump_2 = self._dump_string(obj_2, dumper=AnsibleDumper)
 
         # The gen 1 and gen 2 yaml strings
         self.assertEqual(string_from_object_dump, string_from_object_dump_2)
@@ -58,9 +59,7 @@ class YamlTestUtils(object):
         loader_3 = self._loader(stream_3)
         obj_3 = loader_3.get_data()
 
-        string_from_object_dump_3 = self._dump_string(
-            obj_3, dumper=AnsibleDumper
-        )
+        string_from_object_dump_3 = self._dump_string(obj_3, dumper=AnsibleDumper)
 
         self.assertEqual(obj, obj_3)
         # should be transitive, but...
@@ -92,12 +91,8 @@ class YamlTestUtils(object):
         stream_obj_from_string = io.StringIO()
 
         if PY3:
-            yaml.dump(
-                obj_from_stream, stream_obj_from_stream, Dumper=AnsibleDumper
-            )
-            yaml.dump(
-                obj_from_stream, stream_obj_from_string, Dumper=AnsibleDumper
-            )
+            yaml.dump(obj_from_stream, stream_obj_from_stream, Dumper=AnsibleDumper)
+            yaml.dump(obj_from_stream, stream_obj_from_string, Dumper=AnsibleDumper)
         else:
             yaml.dump(
                 obj_from_stream,
@@ -119,12 +114,8 @@ class YamlTestUtils(object):
         stream_obj_from_string.seek(0)
 
         if PY3:
-            yaml_string_obj_from_stream = yaml.dump(
-                obj_from_stream, Dumper=AnsibleDumper
-            )
-            yaml_string_obj_from_string = yaml.dump(
-                obj_from_string, Dumper=AnsibleDumper
-            )
+            yaml_string_obj_from_stream = yaml.dump(obj_from_stream, Dumper=AnsibleDumper)
+            yaml_string_obj_from_string = yaml.dump(obj_from_string, Dumper=AnsibleDumper)
         else:
             yaml_string_obj_from_stream = yaml.dump(
                 obj_from_stream, Dumper=AnsibleDumper, encoding=None
@@ -134,11 +125,7 @@ class YamlTestUtils(object):
             )
 
         assert yaml_string == yaml_string_obj_from_stream
-        assert (
-            yaml_string
-            == yaml_string_obj_from_stream
-            == yaml_string_obj_from_string
-        )
+        assert yaml_string == yaml_string_obj_from_stream == yaml_string_obj_from_string
         assert (
             yaml_string
             == yaml_string_obj_from_stream