[Python-checkins] bpo-46425: Partially revert "bpo-46425: fix direct invocation of `test_importlib` (GH-30682)" (GH-30799)

[jaraco]

https://github.com/python/cpython/commit/d888ff5381594641126065e78dc9210dae4436a4
commit: d888ff5381594641126065e78dc9210dae4436a4
branch: main
author: Jason R. Coombs <jaraco at jaraco.com>
committer: jaraco <jaraco at jaraco.com>
date: 2022-01-22T21:38:26-05:00
summary:

bpo-46425: Partially revert "bpo-46425: fix direct invocation of `test_importlib` (GH-30682)" (GH-30799)

This reverts commit 57316c52bae5d6420f5067f3891ec328deb97305 for files pertaining to importlib.metadata and importlib.resources.

files:
M Lib/test/test_importlib/test_compatibilty_files.py
M Lib/test/test_importlib/test_contents.py
M Lib/test/test_importlib/test_files.py
M Lib/test/test_importlib/test_main.py
M Lib/test/test_importlib/test_metadata_api.py
M Lib/test/test_importlib/test_open.py
M Lib/test/test_importlib/test_path.py
M Lib/test/test_importlib/test_read.py
M Lib/test/test_importlib/test_resource.py
M Lib/test/test_importlib/test_zip.py

diff --git a/Lib/test/test_importlib/test_compatibilty_files.py b/Lib/test/test_importlib/test_compatibilty_files.py
index 18cbdee6ce475..9a823f2d93058 100644
--- a/Lib/test/test_importlib/test_compatibilty_files.py
+++ b/Lib/test/test_importlib/test_compatibilty_files.py
@@ -8,7 +8,7 @@
     wrap_spec,
 )
 
-from test.test_importlib.resources import util
+from .resources import util
 
 
 class CompatibilityFilesTests(unittest.TestCase):
@@ -100,7 +100,3 @@ def files(self):
 
     def test_spec_path_joinpath(self):
         self.assertIsInstance(self.files / 'a', CompatibilityFiles.OrphanPath)
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/Lib/test/test_importlib/test_contents.py b/Lib/test/test_importlib/test_contents.py
index a5b6538a2fc79..3323bf5b5cf56 100644
--- a/Lib/test/test_importlib/test_contents.py
+++ b/Lib/test/test_importlib/test_contents.py
@@ -1,8 +1,8 @@
 import unittest
 from importlib import resources
 
-from test.test_importlib import data01
-from test.test_importlib.resources import util
+from . import data01
+from .resources import util
 
 
 class ContentsTests:
@@ -38,10 +38,6 @@ class ContentsNamespaceTests(ContentsTests, unittest.TestCase):
     }
 
     def setUp(self):
-        from test.test_importlib import namespacedata01
+        from . import namespacedata01
 
         self.data = namespacedata01
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/Lib/test/test_importlib/test_files.py b/Lib/test/test_importlib/test_files.py
index 3f28b55509bc1..b9170d83bea91 100644
--- a/Lib/test/test_importlib/test_files.py
+++ b/Lib/test/test_importlib/test_files.py
@@ -3,8 +3,8 @@
 
 from importlib import resources
 from importlib.abc import Traversable
-from test.test_importlib import data01
-from test.test_importlib.resources import util
+from . import data01
+from .resources import util
 
 
 class FilesTests:
@@ -37,7 +37,7 @@ class OpenZipTests(FilesTests, util.ZipSetup, unittest.TestCase):
 
 class OpenNamespaceTests(FilesTests, unittest.TestCase):
     def setUp(self):
-        from test.test_importlib import namespacedata01
+        from . import namespacedata01
 
         self.data = namespacedata01
 
diff --git a/Lib/test/test_importlib/test_main.py b/Lib/test/test_importlib/test_main.py
index 77e3dd7e08472..2e120f7ac50ac 100644
--- a/Lib/test/test_importlib/test_main.py
+++ b/Lib/test/test_importlib/test_main.py
@@ -9,9 +9,9 @@
 try:
     import pyfakefs.fake_filesystem_unittest as ffs
 except ImportError:
-    from test.test_importlib.stubs import fake_filesystem_unittest as ffs
+    from .stubs import fake_filesystem_unittest as ffs
 
-from test.test_importlib import fixtures
+from . import fixtures
 from importlib.metadata import (
     Distribution,
     EntryPoint,
@@ -315,7 +315,3 @@ def test_packages_distributions_neither_toplevel_nor_files(self):
             prefix=self.site_dir,
         )
         packages_distributions()
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/Lib/test/test_importlib/test_metadata_api.py b/Lib/test/test_importlib/test_metadata_api.py
index 24d46c3d28013..e16773a7e87ef 100644
--- a/Lib/test/test_importlib/test_metadata_api.py
+++ b/Lib/test/test_importlib/test_metadata_api.py
@@ -5,7 +5,7 @@
 import importlib
 import contextlib
 
-from test.test_importlib import fixtures
+from . import fixtures
 from importlib.metadata import (
     Distribution,
     PackageNotFoundError,
@@ -313,7 +313,3 @@ class InvalidateCache(unittest.TestCase):
     def test_invalidate_cache(self):
         # No externally observable behavior, but ensures test coverage...
         importlib.invalidate_caches()
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/Lib/test/test_importlib/test_open.py b/Lib/test/test_importlib/test_open.py
index ab390269e08f2..df75e343d2c5b 100644
--- a/Lib/test/test_importlib/test_open.py
+++ b/Lib/test/test_importlib/test_open.py
@@ -1,8 +1,8 @@
 import unittest
 
 from importlib import resources
-from test.test_importlib import data01
-from test.test_importlib.resources import util
+from . import data01
+from .resources import util
 
 
 class CommonBinaryTests(util.CommonTests, unittest.TestCase):
@@ -68,7 +68,7 @@ def setUp(self):
 
 class OpenDiskNamespaceTests(OpenTests, unittest.TestCase):
     def setUp(self):
-        from test.test_importlib import namespacedata01
+        from . import namespacedata01
 
         self.data = namespacedata01
 
diff --git a/Lib/test/test_importlib/test_path.py b/Lib/test/test_importlib/test_path.py
index 66dc0b215ad9f..6fc41f301d1ca 100644
--- a/Lib/test/test_importlib/test_path.py
+++ b/Lib/test/test_importlib/test_path.py
@@ -2,8 +2,8 @@
 import unittest
 
 from importlib import resources
-from test.test_importlib import data01
-from test.test_importlib.resources import util
+from . import data01
+from .resources import util
 
 
 class CommonTests(util.CommonTests, unittest.TestCase):
diff --git a/Lib/test/test_importlib/test_read.py b/Lib/test/test_importlib/test_read.py
index 7e907e4c8c59c..ebd72267776d9 100644
--- a/Lib/test/test_importlib/test_read.py
+++ b/Lib/test/test_importlib/test_read.py
@@ -1,8 +1,8 @@
 import unittest
 
 from importlib import import_module, resources
-from test.test_importlib import data01
-from test.test_importlib.resources import util
+from . import data01
+from .resources import util
 
 
 class CommonBinaryTests(util.CommonTests, unittest.TestCase):
@@ -66,7 +66,7 @@ def test_read_submodule_resource_by_name(self):
 
 class ReadNamespaceTests(ReadTests, unittest.TestCase):
     def setUp(self):
-        from test.test_importlib import namespacedata01
+        from . import namespacedata01
 
         self.data = namespacedata01
 
diff --git a/Lib/test/test_importlib/test_resource.py b/Lib/test/test_importlib/test_resource.py
index 825d1b0eb054e..834b8bd8a2818 100644
--- a/Lib/test/test_importlib/test_resource.py
+++ b/Lib/test/test_importlib/test_resource.py
@@ -3,8 +3,9 @@
 import uuid
 import pathlib
 
-from test.test_importlib import data01, zipdata01, zipdata02
-from test.test_importlib.resources import util
+from . import data01
+from . import zipdata01, zipdata02
+from .resources import util
 from importlib import resources, import_module
 from test.support import import_helper
 from test.support.os_helper import unlink
diff --git a/Lib/test/test_importlib/test_zip.py b/Lib/test/test_importlib/test_zip.py
index a9f5c68ac60d7..276f6288c9159 100644
--- a/Lib/test/test_importlib/test_zip.py
+++ b/Lib/test/test_importlib/test_zip.py
@@ -1,7 +1,7 @@
 import sys
 import unittest
 
-from test.test_importlib import fixtures
+from . import fixtures
 from importlib.metadata import (
     PackageNotFoundError,
     distribution,
@@ -60,6 +60,3 @@ def test_files(self):
     def test_normalized_name(self):
         dist = distribution('example')
         assert dist._normalized_name == 'example'
-
-if __name__ == '__main__':
-    unittest.main()