diff options
39 files changed, 74 insertions, 61 deletions
diff --git a/Lib/test/test_importlib/builtin/test_finder.py b/Lib/test/test_importlib/builtin/test_finder.py index 6f51aba..a4869e0 100644 --- a/Lib/test/test_importlib/builtin/test_finder.py +++ b/Lib/test/test_importlib/builtin/test_finder.py @@ -1,5 +1,4 @@ -from .. import abc -from .. import util +from test.test_importlib import abc, util machinery = util.import_importlib('importlib.machinery') diff --git a/Lib/test/test_importlib/builtin/test_loader.py b/Lib/test/test_importlib/builtin/test_loader.py index f6b6d97..7e9d1b19 100644 --- a/Lib/test/test_importlib/builtin/test_loader.py +++ b/Lib/test/test_importlib/builtin/test_loader.py @@ -1,5 +1,4 @@ -from .. import abc -from .. import util +from test.test_importlib import abc, util machinery = util.import_importlib('importlib.machinery') diff --git a/Lib/test/test_importlib/extension/test_case_sensitivity.py b/Lib/test/test_importlib/extension/test_case_sensitivity.py index 20bf035..366e565 100644 --- a/Lib/test/test_importlib/extension/test_case_sensitivity.py +++ b/Lib/test/test_importlib/extension/test_case_sensitivity.py @@ -2,7 +2,7 @@ from importlib import _bootstrap_external from test.support import os_helper import unittest import sys -from .. import util +from test.test_importlib import util importlib = util.import_importlib('importlib') machinery = util.import_importlib('importlib.machinery') diff --git a/Lib/test/test_importlib/extension/test_finder.py b/Lib/test/test_importlib/extension/test_finder.py index e8065d7..140f206 100644 --- a/Lib/test/test_importlib/extension/test_finder.py +++ b/Lib/test/test_importlib/extension/test_finder.py @@ -1,5 +1,4 @@ -from .. import abc -from .. import util +from test.test_importlib import abc, util machinery = util.import_importlib('importlib.machinery') diff --git a/Lib/test/test_importlib/extension/test_loader.py b/Lib/test/test_importlib/extension/test_loader.py index 8fd556d..e7a88a8 100644 --- a/Lib/test/test_importlib/extension/test_loader.py +++ b/Lib/test/test_importlib/extension/test_loader.py @@ -1,6 +1,5 @@ from warnings import catch_warnings -from .. import abc -from .. import util +from test.test_importlib import abc, util machinery = util.import_importlib('importlib.machinery') diff --git a/Lib/test/test_importlib/extension/test_path_hook.py b/Lib/test/test_importlib/extension/test_path_hook.py index a4b5a64..a0adc70 100644 --- a/Lib/test/test_importlib/extension/test_path_hook.py +++ b/Lib/test/test_importlib/extension/test_path_hook.py @@ -1,4 +1,4 @@ -from .. import util +from test.test_importlib import util machinery = util.import_importlib('importlib.machinery') diff --git a/Lib/test/test_importlib/frozen/test_finder.py b/Lib/test/test_importlib/frozen/test_finder.py index 66080b2..0697556 100644 --- a/Lib/test/test_importlib/frozen/test_finder.py +++ b/Lib/test/test_importlib/frozen/test_finder.py @@ -1,5 +1,4 @@ -from .. import abc -from .. import util +from test.test_importlib import abc, util machinery = util.import_importlib('importlib.machinery') diff --git a/Lib/test/test_importlib/frozen/test_loader.py b/Lib/test/test_importlib/frozen/test_loader.py index f1ccb8a..f2df7e6 100644 --- a/Lib/test/test_importlib/frozen/test_loader.py +++ b/Lib/test/test_importlib/frozen/test_loader.py @@ -1,5 +1,4 @@ -from .. import abc -from .. import util +from test.test_importlib import abc, util machinery = util.import_importlib('importlib.machinery') diff --git a/Lib/test/test_importlib/import_/test___loader__.py b/Lib/test/test_importlib/import_/test___loader__.py index ecd83c6..eaf665a 100644 --- a/Lib/test/test_importlib/import_/test___loader__.py +++ b/Lib/test/test_importlib/import_/test___loader__.py @@ -4,7 +4,7 @@ import types import unittest import warnings -from .. import util +from test.test_importlib import util class SpecLoaderMock: diff --git a/Lib/test/test_importlib/import_/test___package__.py b/Lib/test/test_importlib/import_/test___package__.py index 4a2b34e..1ab5018 100644 --- a/Lib/test/test_importlib/import_/test___package__.py +++ b/Lib/test/test_importlib/import_/test___package__.py @@ -6,7 +6,7 @@ of using the typical __path__/__name__ test). """ import unittest import warnings -from .. import util +from test.test_importlib import util class Using__package__: diff --git a/Lib/test/test_importlib/import_/test_api.py b/Lib/test/test_importlib/import_/test_api.py index 35c2697..0ee032b 100644 --- a/Lib/test/test_importlib/import_/test_api.py +++ b/Lib/test/test_importlib/import_/test_api.py @@ -1,4 +1,4 @@ -from .. import util +from test.test_importlib import util from importlib import machinery import sys diff --git a/Lib/test/test_importlib/import_/test_caching.py b/Lib/test/test_importlib/import_/test_caching.py index 0f987b2..3ca765f 100644 --- a/Lib/test/test_importlib/import_/test_caching.py +++ b/Lib/test/test_importlib/import_/test_caching.py @@ -1,5 +1,5 @@ """Test that sys.modules is used properly by import.""" -from .. import util +from test.test_importlib import util import sys from types import MethodType import unittest diff --git a/Lib/test/test_importlib/import_/test_fromlist.py b/Lib/test/test_importlib/import_/test_fromlist.py index deb2171..4b4b9bc 100644 --- a/Lib/test/test_importlib/import_/test_fromlist.py +++ b/Lib/test/test_importlib/import_/test_fromlist.py @@ -1,5 +1,5 @@ """Test that the semantics relating to the 'fromlist' argument are correct.""" -from .. import util +from test.test_importlib import util import warnings import unittest diff --git a/Lib/test/test_importlib/import_/test_meta_path.py b/Lib/test/test_importlib/import_/test_meta_path.py index 5730119..c8b898e 100644 --- a/Lib/test/test_importlib/import_/test_meta_path.py +++ b/Lib/test/test_importlib/import_/test_meta_path.py @@ -1,4 +1,4 @@ -from .. import util +from test.test_importlib import util import importlib._bootstrap import sys from types import MethodType diff --git a/Lib/test/test_importlib/import_/test_packages.py b/Lib/test/test_importlib/import_/test_packages.py index c73ac63..eb0831f 100644 --- a/Lib/test/test_importlib/import_/test_packages.py +++ b/Lib/test/test_importlib/import_/test_packages.py @@ -1,4 +1,4 @@ -from .. import util +from test.test_importlib import util import sys import unittest from test import support diff --git a/Lib/test/test_importlib/import_/test_path.py b/Lib/test/test_importlib/import_/test_path.py index 57a2522..6f1d0ca 100644 --- a/Lib/test/test_importlib/import_/test_path.py +++ b/Lib/test/test_importlib/import_/test_path.py @@ -1,4 +1,4 @@ -from .. import util +from test.test_importlib import util importlib = util.import_importlib('importlib') machinery = util.import_importlib('importlib.machinery') diff --git a/Lib/test/test_importlib/import_/test_relative_imports.py b/Lib/test/test_importlib/import_/test_relative_imports.py index 41aa182..99c24f1 100644 --- a/Lib/test/test_importlib/import_/test_relative_imports.py +++ b/Lib/test/test_importlib/import_/test_relative_imports.py @@ -1,5 +1,5 @@ """Test relative imports (PEP 328).""" -from .. import util +from test.test_importlib import util import unittest import warnings diff --git a/Lib/test/test_importlib/source/test_case_sensitivity.py b/Lib/test/test_importlib/source/test_case_sensitivity.py index 19543f4..9d47270 100644 --- a/Lib/test/test_importlib/source/test_case_sensitivity.py +++ b/Lib/test/test_importlib/source/test_case_sensitivity.py @@ -1,7 +1,7 @@ """Test case-sensitivity (PEP 235).""" import sys -from .. import util +from test.test_importlib import util importlib = util.import_importlib('importlib') machinery = util.import_importlib('importlib.machinery') diff --git a/Lib/test/test_importlib/source/test_file_loader.py b/Lib/test/test_importlib/source/test_file_loader.py index 1065ac5..378dcbe 100644 --- a/Lib/test/test_importlib/source/test_file_loader.py +++ b/Lib/test/test_importlib/source/test_file_loader.py @@ -1,5 +1,4 @@ -from .. import abc -from .. import util +from test.test_importlib import abc, util importlib = util.import_importlib('importlib') importlib_abc = util.import_importlib('importlib.abc') diff --git a/Lib/test/test_importlib/source/test_finder.py b/Lib/test/test_importlib/source/test_finder.py index 80e930c..6a23e9d 100644 --- a/Lib/test/test_importlib/source/test_finder.py +++ b/Lib/test/test_importlib/source/test_finder.py @@ -1,5 +1,4 @@ -from .. import abc -from .. import util +from test.test_importlib import abc, util machinery = util.import_importlib('importlib.machinery') diff --git a/Lib/test/test_importlib/source/test_path_hook.py b/Lib/test/test_importlib/source/test_path_hook.py index 795d436..ead62f5 100644 --- a/Lib/test/test_importlib/source/test_path_hook.py +++ b/Lib/test/test_importlib/source/test_path_hook.py @@ -1,4 +1,4 @@ -from .. import util +from test.test_importlib import util machinery = util.import_importlib('importlib.machinery') diff --git a/Lib/test/test_importlib/source/test_source_encoding.py b/Lib/test/test_importlib/source/test_source_encoding.py index c0b9b03..c09c9aa 100644 --- a/Lib/test/test_importlib/source/test_source_encoding.py +++ b/Lib/test/test_importlib/source/test_source_encoding.py @@ -1,4 +1,4 @@ -from .. import util +from test.test_importlib import util machinery = util.import_importlib('importlib.machinery') diff --git a/Lib/test/test_importlib/test_abc.py b/Lib/test/test_importlib/test_abc.py index 45cbf90..92cb780 100644 --- a/Lib/test/test_importlib/test_abc.py +++ b/Lib/test/test_importlib/test_abc.py @@ -9,7 +9,7 @@ import unittest from unittest import mock import warnings -from . import util as test_util +from test.test_importlib import util as test_util init = test_util.import_importlib('importlib') abc = test_util.import_importlib('importlib.abc') diff --git a/Lib/test/test_importlib/test_api.py b/Lib/test/test_importlib/test_api.py index 763b2ad..1f8f7c0 100644 --- a/Lib/test/test_importlib/test_api.py +++ b/Lib/test/test_importlib/test_api.py @@ -1,4 +1,4 @@ -from . import util as test_util +from test.test_importlib import util as test_util init = test_util.import_importlib('importlib') util = test_util.import_importlib('importlib.util') diff --git a/Lib/test/test_importlib/test_compatibilty_files.py b/Lib/test/test_importlib/test_compatibilty_files.py index 9a823f2..18cbdee 100644 --- a/Lib/test/test_importlib/test_compatibilty_files.py +++ b/Lib/test/test_importlib/test_compatibilty_files.py @@ -8,7 +8,7 @@ from importlib.resources._adapters import ( wrap_spec, ) -from .resources import util +from test.test_importlib.resources import util class CompatibilityFilesTests(unittest.TestCase): @@ -100,3 +100,7 @@ class CompatibilityFilesNoReaderTests(unittest.TestCase): 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 3323bf5..a5b6538 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 . import data01 -from .resources import util +from test.test_importlib import data01 +from test.test_importlib.resources import util class ContentsTests: @@ -38,6 +38,10 @@ class ContentsNamespaceTests(ContentsTests, unittest.TestCase): } def setUp(self): - from . import namespacedata01 + from test.test_importlib 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 b9170d8..3f28b55 100644 --- a/Lib/test/test_importlib/test_files.py +++ b/Lib/test/test_importlib/test_files.py @@ -3,8 +3,8 @@ import unittest from importlib import resources from importlib.abc import Traversable -from . import data01 -from .resources import util +from test.test_importlib import data01 +from test.test_importlib.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 . import namespacedata01 + from test.test_importlib import namespacedata01 self.data = namespacedata01 diff --git a/Lib/test/test_importlib/test_lazy.py b/Lib/test/test_importlib/test_lazy.py index 28608e9..cc993f3 100644 --- a/Lib/test/test_importlib/test_lazy.py +++ b/Lib/test/test_importlib/test_lazy.py @@ -5,7 +5,7 @@ import sys import types import unittest -from . import util as test_util +from test.test_importlib import util as test_util class CollectInit: diff --git a/Lib/test/test_importlib/test_locks.py b/Lib/test/test_importlib/test_locks.py index 9290bac..584d013 100644 --- a/Lib/test/test_importlib/test_locks.py +++ b/Lib/test/test_importlib/test_locks.py @@ -1,4 +1,4 @@ -from . import util as test_util +from test.test_importlib import util as test_util init = test_util.import_importlib('importlib') diff --git a/Lib/test/test_importlib/test_main.py b/Lib/test/test_importlib/test_main.py index 2e120f7..77e3dd7 100644 --- a/Lib/test/test_importlib/test_main.py +++ b/Lib/test/test_importlib/test_main.py @@ -9,9 +9,9 @@ import importlib.metadata try: import pyfakefs.fake_filesystem_unittest as ffs except ImportError: - from .stubs import fake_filesystem_unittest as ffs + from test.test_importlib.stubs import fake_filesystem_unittest as ffs -from . import fixtures +from test.test_importlib import fixtures from importlib.metadata import ( Distribution, EntryPoint, @@ -315,3 +315,7 @@ class PackagesDistributionsTest( 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 e16773a..24d46c3 100644 --- a/Lib/test/test_importlib/test_metadata_api.py +++ b/Lib/test/test_importlib/test_metadata_api.py @@ -5,7 +5,7 @@ import warnings import importlib import contextlib -from . import fixtures +from test.test_importlib import fixtures from importlib.metadata import ( Distribution, PackageNotFoundError, @@ -313,3 +313,7 @@ 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 df75e34..ab39026 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 . import data01 -from .resources import util +from test.test_importlib import data01 +from test.test_importlib.resources import util class CommonBinaryTests(util.CommonTests, unittest.TestCase): @@ -68,7 +68,7 @@ class OpenDiskTests(OpenTests, unittest.TestCase): class OpenDiskNamespaceTests(OpenTests, unittest.TestCase): def setUp(self): - from . import namespacedata01 + from test.test_importlib import namespacedata01 self.data = namespacedata01 diff --git a/Lib/test/test_importlib/test_path.py b/Lib/test/test_importlib/test_path.py index 6fc41f3..66dc0b2 100644 --- a/Lib/test/test_importlib/test_path.py +++ b/Lib/test/test_importlib/test_path.py @@ -2,8 +2,8 @@ import io import unittest from importlib import resources -from . import data01 -from .resources import util +from test.test_importlib import data01 +from test.test_importlib.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 ebd7226..7e907e4 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 . import data01 -from .resources import util +from test.test_importlib import data01 +from test.test_importlib.resources import util class CommonBinaryTests(util.CommonTests, unittest.TestCase): @@ -66,7 +66,7 @@ class ReadZipTests(ReadTests, util.ZipSetup, unittest.TestCase): class ReadNamespaceTests(ReadTests, unittest.TestCase): def setUp(self): - from . import namespacedata01 + from test.test_importlib import namespacedata01 self.data = namespacedata01 diff --git a/Lib/test/test_importlib/test_resource.py b/Lib/test/test_importlib/test_resource.py index 834b8bd..825d1b0 100644 --- a/Lib/test/test_importlib/test_resource.py +++ b/Lib/test/test_importlib/test_resource.py @@ -3,9 +3,8 @@ import unittest import uuid import pathlib -from . import data01 -from . import zipdata01, zipdata02 -from .resources import util +from test.test_importlib import data01, zipdata01, zipdata02 +from test.test_importlib.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_spec.py b/Lib/test/test_importlib/test_spec.py index dcb0527..21e2c02 100644 --- a/Lib/test/test_importlib/test_spec.py +++ b/Lib/test/test_importlib/test_spec.py @@ -1,4 +1,4 @@ -from . import util as test_util +from test.test_importlib import util as test_util init = test_util.import_importlib('importlib') machinery = test_util.import_importlib('importlib.machinery') diff --git a/Lib/test/test_importlib/test_util.py b/Lib/test/test_importlib/test_util.py index 1044522..c77c781 100644 --- a/Lib/test/test_importlib/test_util.py +++ b/Lib/test/test_importlib/test_util.py @@ -1,4 +1,5 @@ -from . import util +from test.test_importlib import util + abc = util.import_importlib('importlib.abc') init = util.import_importlib('importlib') machinery = util.import_importlib('importlib.machinery') diff --git a/Lib/test/test_importlib/test_windows.py b/Lib/test/test_importlib/test_windows.py index 6f09c5a..b3e8e7e 100644 --- a/Lib/test/test_importlib/test_windows.py +++ b/Lib/test/test_importlib/test_windows.py @@ -1,4 +1,4 @@ -from . import util as test_util +from test.test_importlib import util as test_util machinery = test_util.import_importlib('importlib.machinery') import os @@ -6,10 +6,9 @@ import re import sys import unittest import warnings -from test import support from test.support import import_helper from contextlib import contextmanager -from .util import temp_module +from test.test_importlib.util import temp_module import_helper.import_module('winreg', required_on=['win']) from winreg import ( @@ -178,3 +177,6 @@ class WindowsBootstrapPathTests(unittest.TestCase): self.check_join("C:", "C:", "") self.check_join("//Server/Share\\", "//Server/Share/", "") self.check_join("//Server/Share\\", "//Server/Share", "") + +if __name__ == '__main__': + unittest.main() diff --git a/Lib/test/test_importlib/test_zip.py b/Lib/test/test_importlib/test_zip.py index 276f628..a9f5c68 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 . import fixtures +from test.test_importlib import fixtures from importlib.metadata import ( PackageNotFoundError, distribution, @@ -60,3 +60,6 @@ class TestEgg(TestZip): def test_normalized_name(self): dist = distribution('example') assert dist._normalized_name == 'example' + +if __name__ == '__main__': + unittest.main() |