Mailman 3 December 2021 - Python-checkins

bpo-46125: Refactor tests to test traversable API directly. Includes changes from importlib_resources 5.4.0. (GH-30189)
by jaraco Dec. 19, 2021

Dec. 19, 2021

https://github.com/python/cpython/commit/9b52920173735ac609664c6a3a3021d24a… commit: 9b52920173735ac609664c6a3a3021d24a95a092 branch: main author: Jason R. Coombs <jaraco(a)jaraco.com> committer: jaraco <jaraco(a)jaraco.com> date: 2021-12-18T21:28:49-05:00 summary: bpo-46125: Refactor tests to test traversable API directly. Includes changes from importlib_resources 5.4.0. (GH-30189) files: A Misc/NEWS.d/next/Library/2021-12-18-18-29-07.bpo-46125.LLmcox.rst M Lib/importlib/_common.py M Lib/importlib/_legacy.py M Lib/importlib/abc.py M Lib/importlib/resources.py M Lib/test/test_importlib/resources/util.py M Lib/test/test_importlib/test_contents.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 diff --git a/Lib/importlib/_common.py b/Lib/importlib/_common.py index 9b126f3174974..147ea19188f71 100644 --- a/Lib/importlib/_common.py +++ b/Lib/importlib/_common.py @@ -6,13 +6,12 @@ import types import importlib -from typing import Union, Any, Optional +from typing import Union, Optional from .abc import ResourceReader, Traversable from ._adapters import wrap_spec Package = Union[types.ModuleType, str] -Resource = Union[str, os.PathLike] def files(package): @@ -23,19 +22,6 @@ def files(package): return from_package(get_package(package)) -def normalize_path(path): - # type: (Any) -> str - """Normalize a path by ensuring it is a string. - - If the resulting string contains path separators, an exception is raised. - """ - str_path = str(path) - parent, file_name = os.path.split(str_path) - if parent: - raise ValueError(f'{path!r} must be only a file name') - return file_name - - def get_resource_reader(package): # type: (types.ModuleType) -> Optional[ResourceReader] """ diff --git a/Lib/importlib/_legacy.py b/Lib/importlib/_legacy.py index 477f89e4c3abd..1d5d3f1fbb1f6 100644 --- a/Lib/importlib/_legacy.py +++ b/Lib/importlib/_legacy.py @@ -4,12 +4,12 @@ import types import warnings -from typing import Union, Iterable, ContextManager, BinaryIO, TextIO +from typing import Union, Iterable, ContextManager, BinaryIO, TextIO, Any from . import _common Package = Union[types.ModuleType, str] -Resource = Union[str, os.PathLike] +Resource = str def deprecated(func): @@ -27,16 +27,29 @@ def wrapper(*args, **kwargs): return wrapper +def normalize_path(path): + # type: (Any) -> str + """Normalize a path by ensuring it is a string. + + If the resulting string contains path separators, an exception is raised. + """ + str_path = str(path) + parent, file_name = os.path.split(str_path) + if parent: + raise ValueError(f'{path!r} must be only a file name') + return file_name + + @deprecated def open_binary(package: Package, resource: Resource) -> BinaryIO: """Return a file-like object opened for binary reading of the resource.""" - return (_common.files(package) / _common.normalize_path(resource)).open('rb') + return (_common.files(package) / normalize_path(resource)).open('rb') @deprecated def read_binary(package: Package, resource: Resource) -> bytes: """Return the binary contents of the resource.""" - return (_common.files(package) / _common.normalize_path(resource)).read_bytes() + return (_common.files(package) / normalize_path(resource)).read_bytes() @deprecated @@ -47,7 +60,7 @@ def open_text( errors: str = 'strict', ) -> TextIO: """Return a file-like object opened for text reading of the resource.""" - return (_common.files(package) / _common.normalize_path(resource)).open( + return (_common.files(package) / normalize_path(resource)).open( 'r', encoding=encoding, errors=errors ) @@ -85,7 +98,7 @@ def is_resource(package: Package, name: str) -> bool: Directories are *not* resources. """ - resource = _common.normalize_path(name) + resource = normalize_path(name) return any( traversable.name == resource and traversable.is_file() for traversable in _common.files(package).iterdir() @@ -105,4 +118,4 @@ def path( raised if the file was deleted prior to the context manager exiting). """ - return _common.as_file(_common.files(package) / _common.normalize_path(resource)) + return _common.as_file(_common.files(package) / normalize_path(resource)) diff --git a/Lib/importlib/abc.py b/Lib/importlib/abc.py index 1d6843b2ddd44..f10441608ad71 100644 --- a/Lib/importlib/abc.py +++ b/Lib/importlib/abc.py @@ -381,7 +381,7 @@ def read_text(self, encoding=None): @abc.abstractmethod def is_dir(self) -> bool: """ - Return True if self is a dir + Return True if self is a directory """ @abc.abstractmethod diff --git a/Lib/importlib/resources.py b/Lib/importlib/resources.py index 6cc46283ba0a2..5b3bc0228d9ac 100644 --- a/Lib/importlib/resources.py +++ b/Lib/importlib/resources.py @@ -4,7 +4,6 @@ as_file, files, Package, - Resource, ) from ._legacy import ( @@ -15,6 +14,7 @@ read_text, is_resource, path, + Resource, ) from importlib.abc import ResourceReader diff --git a/Lib/test/test_importlib/resources/util.py b/Lib/test/test_importlib/resources/util.py index 719263223032a..11c8aa80806dc 100644 --- a/Lib/test/test_importlib/resources/util.py +++ b/Lib/test/test_importlib/resources/util.py @@ -1,10 +1,8 @@ import abc -import contextlib import importlib import io import sys import types -import warnings from pathlib import Path, PurePath from .. import data01 @@ -69,13 +67,6 @@ def create_package(file=None, path=None, is_package=True, contents=()): ) -(a)contextlib.contextmanager -def suppress_known_deprecation(): - with warnings.catch_warnings(record=True) as ctx: - warnings.simplefilter('default', category=DeprecationWarning) - yield ctx - - class CommonTests(metaclass=abc.ABCMeta): """ Tests shared by test_open, test_path, and test_read. @@ -106,18 +97,6 @@ def test_pathlib_path(self): path = PurePath('utf-8.file') self.execute(data01, path) - def test_absolute_path(self): - # An absolute path is a ValueError. - path = Path(__file__) - full_path = path.parent / 'utf-8.file' - with self.assertRaises(ValueError): - self.execute(data01, full_path) - - def test_relative_path(self): - # A reative path is a ValueError. - with self.assertRaises(ValueError): - self.execute(data01, '../data01/utf-8.file') - def test_importing_module_as_side_effect(self): # The anchor package can already be imported. del sys.modules[data01.__name__] diff --git a/Lib/test/test_importlib/test_contents.py b/Lib/test/test_importlib/test_contents.py index 575dcd2f30473..3323bf5b5cf56 100644 --- a/Lib/test/test_importlib/test_contents.py +++ b/Lib/test/test_importlib/test_contents.py @@ -15,8 +15,8 @@ class ContentsTests: } def test_contents(self): - with util.suppress_known_deprecation(): - assert self.expected <= set(resources.contents(self.data)) + contents = {path.name for path in resources.files(self.data).iterdir()} + assert self.expected <= contents class ContentsDiskTests(ContentsTests, unittest.TestCase): diff --git a/Lib/test/test_importlib/test_open.py b/Lib/test/test_importlib/test_open.py index a9c4a7085c197..df75e343d2c5b 100644 --- a/Lib/test/test_importlib/test_open.py +++ b/Lib/test/test_importlib/test_open.py @@ -7,47 +7,44 @@ class CommonBinaryTests(util.CommonTests, unittest.TestCase): def execute(self, package, path): - with util.suppress_known_deprecation(): - with resources.open_binary(package, path): - pass + target = resources.files(package).joinpath(path) + with target.open('rb'): + pass class CommonTextTests(util.CommonTests, unittest.TestCase): def execute(self, package, path): - with util.suppress_known_deprecation(): - with resources.open_text(package, path): - pass + target = resources.files(package).joinpath(path) + with target.open(): + pass class OpenTests: def test_open_binary(self): - with util.suppress_known_deprecation(): - with resources.open_binary(self.data, 'binary.file') as fp: - result = fp.read() - self.assertEqual(result, b'\x00\x01\x02\x03') + target = resources.files(self.data) / 'binary.file' + with target.open('rb') as fp: + result = fp.read() + self.assertEqual(result, b'\x00\x01\x02\x03') def test_open_text_default_encoding(self): - with util.suppress_known_deprecation(): - with resources.open_text(self.data, 'utf-8.file') as fp: - result = fp.read() + target = resources.files(self.data) / 'utf-8.file' + with target.open() as fp: + result = fp.read() self.assertEqual(result, 'Hello, UTF-8 world!\n') def test_open_text_given_encoding(self): - with util.suppress_known_deprecation(): - with resources.open_text( - self.data, 'utf-16.file', 'utf-16', 'strict' - ) as fp: - result = fp.read() + target = resources.files(self.data) / 'utf-16.file' + with target.open(encoding='utf-16', errors='strict') as fp: + result = fp.read() self.assertEqual(result, 'Hello, UTF-16 world!\n') def test_open_text_with_errors(self): # Raises UnicodeError without the 'errors' argument. - with util.suppress_known_deprecation(): - with resources.open_text(self.data, 'utf-16.file', 'utf-8', 'strict') as fp: - self.assertRaises(UnicodeError, fp.read) - with util.suppress_known_deprecation(): - with resources.open_text(self.data, 'utf-16.file', 'utf-8', 'ignore') as fp: - result = fp.read() + target = resources.files(self.data) / 'utf-16.file' + with target.open(encoding='utf-8', errors='strict') as fp: + self.assertRaises(UnicodeError, fp.read) + with target.open(encoding='utf-8', errors='ignore') as fp: + result = fp.read() self.assertEqual( result, 'H\x00e\x00l\x00l\x00o\x00,\x00 ' @@ -56,16 +53,12 @@ def test_open_text_with_errors(self): ) def test_open_binary_FileNotFoundError(self): - with util.suppress_known_deprecation(): - self.assertRaises( - FileNotFoundError, resources.open_binary, self.data, 'does-not-exist' - ) + target = resources.files(self.data) / 'does-not-exist' + self.assertRaises(FileNotFoundError, target.open, 'rb') def test_open_text_FileNotFoundError(self): - with util.suppress_known_deprecation(): - self.assertRaises( - FileNotFoundError, resources.open_text, self.data, 'does-not-exist' - ) + target = resources.files(self.data) / 'does-not-exist' + self.assertRaises(FileNotFoundError, target.open) class OpenDiskTests(OpenTests, unittest.TestCase): diff --git a/Lib/test/test_importlib/test_path.py b/Lib/test/test_importlib/test_path.py index 3ccbc6fbd2af3..6fc41f301d1ca 100644 --- a/Lib/test/test_importlib/test_path.py +++ b/Lib/test/test_importlib/test_path.py @@ -8,9 +8,8 @@ class CommonTests(util.CommonTests, unittest.TestCase): def execute(self, package, path): - with util.suppress_known_deprecation(): - with resources.path(package, path): - pass + with resources.as_file(resources.files(package).joinpath(path)): + pass class PathTests: @@ -18,13 +17,13 @@ def test_reading(self): # Path should be readable. # Test also implicitly verifies the returned object is a pathlib.Path # instance. - with util.suppress_known_deprecation(): - with resources.path(self.data, 'utf-8.file') as path: - self.assertTrue(path.name.endswith("utf-8.file"), repr(path)) - # pathlib.Path.read_text() was introduced in Python 3.5. - with path.open('r', encoding='utf-8') as file: - text = file.read() - self.assertEqual('Hello, UTF-8 world!\n', text) + target = resources.files(self.data) / 'utf-8.file' + with resources.as_file(target) as path: + self.assertTrue(path.name.endswith("utf-8.file"), repr(path)) + # pathlib.Path.read_text() was introduced in Python 3.5. + with path.open('r', encoding='utf-8') as file: + text = file.read() + self.assertEqual('Hello, UTF-8 world!\n', text) class PathDiskTests(PathTests, unittest.TestCase): @@ -34,9 +33,9 @@ def test_natural_path(self): # Guarantee the internal implementation detail that # file-system-backed resources do not get the tempdir # treatment. - with util.suppress_known_deprecation(): - with resources.path(self.data, 'utf-8.file') as path: - assert 'data' in str(path) + target = resources.files(self.data) / 'utf-8.file' + with resources.as_file(target) as path: + assert 'data' in str(path) class PathMemoryTests(PathTests, unittest.TestCase): @@ -54,9 +53,9 @@ class PathZipTests(PathTests, util.ZipSetup, unittest.TestCase): def test_remove_in_context_manager(self): # It is not an error if the file that was temporarily stashed on the # file system is removed inside the `with` stanza. - with util.suppress_known_deprecation(): - with resources.path(self.data, 'utf-8.file') as path: - path.unlink() + target = resources.files(self.data) / 'utf-8.file' + with resources.as_file(target) as path: + path.unlink() if __name__ == '__main__': diff --git a/Lib/test/test_importlib/test_read.py b/Lib/test/test_importlib/test_read.py index 1bab5c97f41bf..ebd72267776d9 100644 --- a/Lib/test/test_importlib/test_read.py +++ b/Lib/test/test_importlib/test_read.py @@ -7,40 +7,36 @@ class CommonBinaryTests(util.CommonTests, unittest.TestCase): def execute(self, package, path): - with util.suppress_known_deprecation(): - resources.read_binary(package, path) + resources.files(package).joinpath(path).read_bytes() class CommonTextTests(util.CommonTests, unittest.TestCase): def execute(self, package, path): - with util.suppress_known_deprecation(): - resources.read_text(package, path) + resources.files(package).joinpath(path).read_text() class ReadTests: - def test_read_binary(self): - with util.suppress_known_deprecation(): - result = resources.read_binary(self.data, 'binary.file') + def test_read_bytes(self): + result = resources.files(self.data).joinpath('binary.file').read_bytes() self.assertEqual(result, b'\0\1\2\3') def test_read_text_default_encoding(self): - with util.suppress_known_deprecation(): - result = resources.read_text(self.data, 'utf-8.file') + result = resources.files(self.data).joinpath('utf-8.file').read_text() self.assertEqual(result, 'Hello, UTF-8 world!\n') def test_read_text_given_encoding(self): - with util.suppress_known_deprecation(): - result = resources.read_text(self.data, 'utf-16.file', encoding='utf-16') + result = ( + resources.files(self.data) + .joinpath('utf-16.file') + .read_text(encoding='utf-16') + ) self.assertEqual(result, 'Hello, UTF-16 world!\n') def test_read_text_with_errors(self): # Raises UnicodeError without the 'errors' argument. - with util.suppress_known_deprecation(): - self.assertRaises( - UnicodeError, resources.read_text, self.data, 'utf-16.file' - ) - with util.suppress_known_deprecation(): - result = resources.read_text(self.data, 'utf-16.file', errors='ignore') + target = resources.files(self.data) / 'utf-16.file' + self.assertRaises(UnicodeError, target.read_text, encoding='utf-8') + result = target.read_text(encoding='utf-8', errors='ignore') self.assertEqual( result, 'H\x00e\x00l\x00l\x00o\x00,\x00 ' @@ -56,13 +52,15 @@ class ReadDiskTests(ReadTests, unittest.TestCase): class ReadZipTests(ReadTests, util.ZipSetup, unittest.TestCase): def test_read_submodule_resource(self): submodule = import_module('ziptestdata.subdirectory') - with util.suppress_known_deprecation(): - result = resources.read_binary(submodule, 'binary.file') + result = resources.files(submodule).joinpath('binary.file').read_bytes() self.assertEqual(result, b'\0\1\2\3') def test_read_submodule_resource_by_name(self): - with util.suppress_known_deprecation(): - result = resources.read_binary('ziptestdata.subdirectory', 'binary.file') + result = ( + resources.files('ziptestdata.subdirectory') + .joinpath('binary.file') + .read_bytes() + ) self.assertEqual(result, b'\0\1\2\3') diff --git a/Lib/test/test_importlib/test_resource.py b/Lib/test/test_importlib/test_resource.py index 39904591a5248..834b8bd8a2818 100644 --- a/Lib/test/test_importlib/test_resource.py +++ b/Lib/test/test_importlib/test_resource.py @@ -14,38 +14,18 @@ class ResourceTests: # Subclasses are expected to set the `data` attribute. - def test_is_resource_good_path(self): - with util.suppress_known_deprecation(): - self.assertTrue(resources.is_resource(self.data, 'binary.file')) - - def test_is_resource_missing(self): - with util.suppress_known_deprecation(): - self.assertFalse(resources.is_resource(self.data, 'not-a-file')) - - def test_is_resource_subresource_directory(self): - # Directories are not resources. - with util.suppress_known_deprecation(): - self.assertFalse(resources.is_resource(self.data, 'subdirectory')) - - def test_contents(self): - with util.suppress_known_deprecation(): - contents = set(resources.contents(self.data)) - # There may be cruft in the directory listing of the data directory. - # It could have a __pycache__ directory, - # an artifact of the - # test suite importing these modules, which - # are not germane to this test, so just filter them out. - contents.discard('__pycache__') - self.assertEqual( - sorted(contents), - [ - '__init__.py', - 'binary.file', - 'subdirectory', - 'utf-16.file', - 'utf-8.file', - ], - ) + def test_is_file_exists(self): + target = resources.files(self.data) / 'binary.file' + self.assertTrue(target.is_file()) + + def test_is_file_missing(self): + target = resources.files(self.data) / 'not-a-file' + self.assertFalse(target.is_file()) + + def test_is_dir(self): + target = resources.files(self.data) / 'subdirectory' + self.assertFalse(target.is_file()) + self.assertTrue(target.is_dir()) class ResourceDiskTests(ResourceTests, unittest.TestCase): @@ -57,34 +37,34 @@ class ResourceZipTests(ResourceTests, util.ZipSetup, unittest.TestCase): pass +def names(traversable): + return {item.name for item in traversable.iterdir()} + + class ResourceLoaderTests(unittest.TestCase): def test_resource_contents(self): package = util.create_package( file=data01, path=data01.__file__, contents=['A', 'B', 'C'] ) - with util.suppress_known_deprecation(): - self.assertEqual(set(resources.contents(package)), {'A', 'B', 'C'}) + self.assertEqual(names(resources.files(package)), {'A', 'B', 'C'}) - def test_resource_is_resource(self): + def test_is_file(self): package = util.create_package( file=data01, path=data01.__file__, contents=['A', 'B', 'C', 'D/E', 'D/F'] ) - with util.suppress_known_deprecation(): - self.assertTrue(resources.is_resource(package, 'B')) + self.assertTrue(resources.files(package).joinpath('B').is_file()) - def test_resource_directory_is_not_resource(self): + def test_is_dir(self): package = util.create_package( file=data01, path=data01.__file__, contents=['A', 'B', 'C', 'D/E', 'D/F'] ) - with util.suppress_known_deprecation(): - self.assertFalse(resources.is_resource(package, 'D')) + self.assertTrue(resources.files(package).joinpath('D').is_dir()) - def test_resource_missing_is_not_resource(self): + def test_resource_missing(self): package = util.create_package( file=data01, path=data01.__file__, contents=['A', 'B', 'C', 'D/E', 'D/F'] ) - with util.suppress_known_deprecation(): - self.assertFalse(resources.is_resource(package, 'Z')) + self.assertFalse(resources.files(package).joinpath('Z').is_file()) class ResourceCornerCaseTests(unittest.TestCase): @@ -102,8 +82,7 @@ def test_package_has_no_reader_fallback(self): module.__file__ = '/path/which/shall/not/be/named' module.__spec__.loader = module.__loader__ module.__spec__.origin = module.__file__ - with util.suppress_known_deprecation(): - self.assertFalse(resources.is_resource(module, 'A')) + self.assertFalse(resources.files(module).joinpath('A').is_file()) class ResourceFromZipsTest01(util.ZipSetupBase, unittest.TestCase): @@ -111,28 +90,26 @@ class ResourceFromZipsTest01(util.ZipSetupBase, unittest.TestCase): def test_is_submodule_resource(self): submodule = import_module('ziptestdata.subdirectory') - with util.suppress_known_deprecation(): - self.assertTrue(resources.is_resource(submodule, 'binary.file')) + self.assertTrue(resources.files(submodule).joinpath('binary.file').is_file()) def test_read_submodule_resource_by_name(self): - with util.suppress_known_deprecation(): - self.assertTrue( - resources.is_resource('ziptestdata.subdirectory', 'binary.file') - ) + self.assertTrue( + resources.files('ziptestdata.subdirectory') + .joinpath('binary.file') + .is_file() + ) def test_submodule_contents(self): submodule = import_module('ziptestdata.subdirectory') - with util.suppress_known_deprecation(): - self.assertEqual( - set(resources.contents(submodule)), {'__init__.py', 'binary.file'} - ) + self.assertEqual( + names(resources.files(submodule)), {'__init__.py', 'binary.file'} + ) def test_submodule_contents_by_name(self): - with util.suppress_known_deprecation(): - self.assertEqual( - set(resources.contents('ziptestdata.subdirectory')), - {'__init__.py', 'binary.file'}, - ) + self.assertEqual( + names(resources.files('ziptestdata.subdirectory')), + {'__init__.py', 'binary.file'}, + ) class ResourceFromZipsTest02(util.ZipSetupBase, unittest.TestCase): @@ -143,16 +120,14 @@ def test_unrelated_contents(self): Test thata zip with two unrelated subpackages return distinct resources. Ref python/importlib_resources#44. """ - with util.suppress_known_deprecation(): - self.assertEqual( - set(resources.contents('ziptestdata.one')), - {'__init__.py', 'resource1.txt'}, - ) - with util.suppress_known_deprecation(): - self.assertEqual( - set(resources.contents('ziptestdata.two')), - {'__init__.py', 'resource2.txt'}, - ) + self.assertEqual( + names(resources.files('ziptestdata.one')), + {'__init__.py', 'resource1.txt'}, + ) + self.assertEqual( + names(resources.files('ziptestdata.two')), + {'__init__.py', 'resource2.txt'}, + ) class DeletingZipsTest(unittest.TestCase): @@ -192,47 +167,43 @@ def tearDown(self): # If the test fails, this will probably fail too pass - def test_contents_does_not_keep_open(self): - with util.suppress_known_deprecation(): - c = resources.contents('ziptestdata') + def test_iterdir_does_not_keep_open(self): + c = [item.name for item in resources.files('ziptestdata').iterdir()] self.zip_path.unlink() del c - def test_is_resource_does_not_keep_open(self): - with util.suppress_known_deprecation(): - c = resources.is_resource('ziptestdata', 'binary.file') + def test_is_file_does_not_keep_open(self): + c = resources.files('ziptestdata').joinpath('binary.file').is_file() self.zip_path.unlink() del c - def test_is_resource_failure_does_not_keep_open(self): - with util.suppress_known_deprecation(): - c = resources.is_resource('ziptestdata', 'not-present') + def test_is_file_failure_does_not_keep_open(self): + c = resources.files('ziptestdata').joinpath('not-present').is_file() self.zip_path.unlink() del c @unittest.skip("Desired but not supported.") - def test_path_does_not_keep_open(self): - c = resources.path('ziptestdata', 'binary.file') + def test_as_file_does_not_keep_open(self): # pragma: no cover + c = resources.as_file(resources.files('ziptestdata') / 'binary.file') self.zip_path.unlink() del c def test_entered_path_does_not_keep_open(self): # This is what certifi does on import to make its bundle # available for the process duration. - with util.suppress_known_deprecation(): - c = resources.path('ziptestdata', 'binary.file').__enter__() + c = resources.as_file( + resources.files('ziptestdata') / 'binary.file' + ).__enter__() self.zip_path.unlink() del c def test_read_binary_does_not_keep_open(self): - with util.suppress_known_deprecation(): - c = resources.read_binary('ziptestdata', 'binary.file') + c = resources.files('ziptestdata').joinpath('binary.file').read_bytes() self.zip_path.unlink() del c def test_read_text_does_not_keep_open(self): - with util.suppress_known_deprecation(): - c = resources.read_text('ziptestdata', 'utf-8.file', encoding='utf-8') + c = resources.files('ziptestdata').joinpath('utf-8.file').read_text() self.zip_path.unlink() del c @@ -249,18 +220,19 @@ def tearDownClass(cls): sys.path.remove(cls.site_dir) def test_is_submodule_resource(self): - with util.suppress_known_deprecation(): - self.assertTrue( - resources.is_resource(import_module('namespacedata01'), 'binary.file') - ) + self.assertTrue( + resources.files(import_module('namespacedata01')) + .joinpath('binary.file') + .is_file() + ) def test_read_submodule_resource_by_name(self): - with util.suppress_known_deprecation(): - self.assertTrue(resources.is_resource('namespacedata01', 'binary.file')) + self.assertTrue( + resources.files('namespacedata01').joinpath('binary.file').is_file() + ) def test_submodule_contents(self): - with util.suppress_known_deprecation(): - contents = set(resources.contents(import_module('namespacedata01'))) + contents = names(resources.files(import_module('namespacedata01'))) try: contents.remove('__pycache__') except KeyError: @@ -268,8 +240,7 @@ def test_submodule_contents(self): self.assertEqual(contents, {'binary.file', 'utf-8.file', 'utf-16.file'}) def test_submodule_contents_by_name(self): - with util.suppress_known_deprecation(): - contents = set(resources.contents('namespacedata01')) + contents = names(resources.files('namespacedata01')) try: contents.remove('__pycache__') except KeyError: diff --git a/Misc/NEWS.d/next/Library/2021-12-18-18-29-07.bpo-46125.LLmcox.rst b/Misc/NEWS.d/next/Library/2021-12-18-18-29-07.bpo-46125.LLmcox.rst new file mode 100644 index 0000000000000..d2c3a32dfdc13 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2021-12-18-18-29-07.bpo-46125.LLmcox.rst @@ -0,0 +1,2 @@ +Refactor tests to test traversable API directly. Includes changes from +importlib 5.4.0.

1 0

bpo-46044: Fix doc typo introduced in GH-30043 (GH-30171)
by miss-islington Dec. 19, 2021

Dec. 19, 2021

https://github.com/python/cpython/commit/fe68486197cb26a69ecce9353271d91adf… commit: fe68486197cb26a69ecce9353271d91adf885cb5 branch: main author: Matthias Bussonnier <bussonniermatthias(a)gmail.com> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2021-12-18T13:19:07-08:00 summary: bpo-46044: Fix doc typo introduced in GH-30043 (GH-30171) See https://github.com/python/cpython/pull/30043/files#r770944718 My bad I likely messed up by using a repeat command in my editor Automerge-Triggered-By: GH:merwok files: M Doc/distutils/sourcedist.rst diff --git a/Doc/distutils/sourcedist.rst b/Doc/distutils/sourcedist.rst index 43fbb03547f78..7b1e22f824e8c 100644 --- a/Doc/distutils/sourcedist.rst +++ b/Doc/distutils/sourcedist.rst @@ -37,7 +37,7 @@ to create a gzipped tarball and a zip file. The available formats are: | ``xztar`` | xz'ed tar file | \(5) | | | (:file:`.tar.xz`) | | +-----------+-------------------------+-------------+ -| ``ztar`` | compressed tar file | \(5) | +| ``ztar`` | compressed tar file | (4),(5) | | | (:file:`.tar.Z`) | | +-----------+-------------------------+-------------+ | ``tar`` | tar file (:file:`.tar`) | \(5) |

1 0

bpo-46099: Fix pthread_getcpuclockid test on Solaris (GH-30140) (#30184)
by asvetlov Dec. 18, 2021

Dec. 18, 2021

https://github.com/python/cpython/commit/a328ad7f9a9b6cd624da5efcc76daf88e0… commit: a328ad7f9a9b6cd624da5efcc76daf88e0d22312 branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: asvetlov <andrew.svetlov(a)gmail.com> date: 2021-12-18T17:51:34+02:00 summary: bpo-46099: Fix pthread_getcpuclockid test on Solaris (GH-30140) (#30184) Co-authored-by: Andrew Svetlov <andrew.svetlov(a)gmail.com> (cherry picked from commit 427a490c495cde8a152e938c6f02be65620e3e59) Co-authored-by: Jakub Kulík <Kulikjak(a)gmail.com> files: M Lib/test/test_time.py diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py index 90a123828b709..be9fb5ad5f0b1 100644 --- a/Lib/test/test_time.py +++ b/Lib/test/test_time.py @@ -112,12 +112,13 @@ def test_pthread_getcpuclockid(self): clk_id = time.pthread_getcpuclockid(threading.get_ident()) self.assertTrue(type(clk_id) is int) # when in 32-bit mode AIX only returns the predefined constant - if not platform.system() == "AIX": - self.assertNotEqual(clk_id, time.CLOCK_THREAD_CPUTIME_ID) - elif (sys.maxsize.bit_length() > 32): - self.assertNotEqual(clk_id, time.CLOCK_THREAD_CPUTIME_ID) - else: + if platform.system() == "AIX" and (sys.maxsize.bit_length() <= 32): self.assertEqual(clk_id, time.CLOCK_THREAD_CPUTIME_ID) + # Solaris returns CLOCK_THREAD_CPUTIME_ID when current thread is given + elif sys.platform.startswith("sunos"): + self.assertEqual(clk_id, time.CLOCK_THREAD_CPUTIME_ID) + else: + self.assertNotEqual(clk_id, time.CLOCK_THREAD_CPUTIME_ID) t1 = time.clock_gettime(clk_id) t2 = time.clock_gettime(clk_id) self.assertLessEqual(t1, t2)

1 0

bpo-40280: Add Tools/wasm with helpers for cross building (GH-29984)
by tiran Dec. 18, 2021

Dec. 18, 2021

https://github.com/python/cpython/commit/0339434835aa74dc78a38ae12ea7d2973c… commit: 0339434835aa74dc78a38ae12ea7d2973c144eb1 branch: main author: Christian Heimes <christian(a)python.org> committer: tiran <christian(a)python.org> date: 2021-12-18T15:54:02+01:00 summary: bpo-40280: Add Tools/wasm with helpers for cross building (GH-29984) Co-authored-by: Ethan Smith <ethan(a)ethanhs.me> Co-authored-by: Brett Cannon <brett(a)python.org> files: A Misc/NEWS.d/next/Build/2021-12-13-21-03-52.bpo-40280.b7NG4Y.rst A Tools/wasm/README.md A Tools/wasm/config.site-wasm32-emscripten A Tools/wasm/wasm_assets.py M Makefile.pre.in M configure M configure.ac diff --git a/Makefile.pre.in b/Makefile.pre.in index 59c92a0568022..ed77bebfab901 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -830,6 +830,22 @@ $(DLLLIBRARY) libpython$(LDVERSION).dll.a: $(LIBRARY_OBJS) else true; \ fi +# wasm32-emscripten build +# wasm assets directory is relative to current build dir, e.g. "./usr/local". +# --preload-file turns a relative asset path into an absolute path. +WASM_ASSETS_DIR=".$(prefix)" +WASM_STDLIB="$(WASM_ASSETS_DIR)/local/lib/python$(VERSION)/os.py" + +$(WASM_STDLIB): $(srcdir)/Lib/*.py $(srcdir)/Lib/*/*.py \ + pybuilddir.txt $(srcdir)/Tools/wasm/wasm_assets.py + $(PYTHON_FOR_BUILD) $(srcdir)/Tools/wasm/wasm_assets.py \ + --builddir . --prefix $(prefix) + +python.html: Programs/python.o $(LIBRARY_DEPS) $(WASM_STDLIB) + $(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o \ + $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) \ + -s ASSERTIONS=1 --preload-file $(WASM_ASSETS_DIR) + ########################################################################## # Build static libmpdec.a LIBMPDEC_CFLAGS=$(PY_STDMODULE_CFLAGS) $(CCSHARED) @LIBMPDEC_CFLAGS@ @@ -938,6 +954,7 @@ Makefile Modules/config.c: Makefile.pre \ $(SHELL) $(MAKESETUP) -c $(srcdir)/Modules/config.c.in \ -s Modules \ Modules/Setup.local \ + @MODULES_SETUP_STDLIB@ \ $(srcdir)/Modules/Setup.bootstrap \ $(srcdir)/Modules/Setup @mv config.c Modules @@ -2379,6 +2396,7 @@ clean-retain-profile: pycremoval -rm -f pybuilddir.txt -rm -f Lib/lib2to3/*Grammar*.pickle -rm -f _bootstrap_python + -rm -f python.html python.js python.data -rm -f Programs/_testembed Programs/_freeze_module -rm -f Python/deepfreeze/*.[co] -rm -f Python/frozen_modules/*.h diff --git a/Misc/NEWS.d/next/Build/2021-12-13-21-03-52.bpo-40280.b7NG4Y.rst b/Misc/NEWS.d/next/Build/2021-12-13-21-03-52.bpo-40280.b7NG4Y.rst new file mode 100644 index 0000000000000..905ee44680276 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2021-12-13-21-03-52.bpo-40280.b7NG4Y.rst @@ -0,0 +1 @@ +A new directory ``Tools/wasm`` contains WebAssembly-related helpers like ``config.site`` override for wasm32-emscripten, wasm assets generator to bundle the stdlib, and a README. diff --git a/Tools/wasm/README.md b/Tools/wasm/README.md new file mode 100644 index 0000000000000..93c76b225db79 --- /dev/null +++ b/Tools/wasm/README.md @@ -0,0 +1,55 @@ +# Python WebAssembly (WASM) build + +This directory contains configuration and helpers to facilitate cross +compilation of CPython to WebAssembly (WASM). + +## wasm32-emscripten build + +Cross compiling to wasm32-emscripten platform needs the [Emscripten](https://emscripten.org/) +tool chain and a build Python interpreter. +All commands below are relative to a repository checkout. + +### Compile a build Python interpreter + +```shell +mkdir -p builddir/build +pushd builddir/build +../../configure -C +make -j$(nproc) +popd +``` + +### Fetch and build additional emscripten ports + +```shell +embuilder build zlib +``` + +### Cross compile to wasm32-emscripten + +```shell +mkdir -p builddir/emscripten +pushd builddir/emscripten + +CONFIG_SITE=../../Tools/wasm/config.site-wasm32-emscripten \ + emconfigure ../../configure -C \ + --host=wasm32-unknown-emscripten \ + --build=$(../../config.guess) \ + --with-build-python=$(pwd)/../build/python + +emmake make -j$(nproc) python.html +``` + +### Test in browser + +Serve `python.html` with a local webserver and open the file in a browser. + +```shell +emrun python.html +``` + +or + +```shell +python3 -m http.server +``` diff --git a/Tools/wasm/config.site-wasm32-emscripten b/Tools/wasm/config.site-wasm32-emscripten new file mode 100644 index 0000000000000..67304be060b52 --- /dev/null +++ b/Tools/wasm/config.site-wasm32-emscripten @@ -0,0 +1,70 @@ +# config.site override for cross compiling to wasm32-emscripten platform +# +# CONFIG_SITE=Tools/wasm/config.site-wasm32-emscripten \ +# emconfigure ./configure --host=wasm32-unknown-emscripten --build=... +# +# Written by Christian Heimes <christian(a)python.org> +# Partly based on pyodide's pyconfig.undefs.h file. +# + +# cannot be detected in cross builds +ac_cv_buggy_getaddrinfo=no + +# Emscripten has no /dev/pt* +ac_cv_file__dev_ptmx=no +ac_cv_file__dev_ptc=no + +# dummy readelf, Emscripten build does not need readelf. +ac_cv_prog_ac_ct_READELF=true + +# new undefined symbols / unsupported features +ac_cv_func_posix_spawn=no +ac_cv_func_posix_spawnp=no +ac_cv_func_eventfd=no +ac_cv_func_memfd_create=no +ac_cv_func_prlimit=no + +# unsupported syscall, https://github.com/emscripten-core/emscripten/issues/13393 +ac_cv_func_shutdown=no + +# breaks build, see https://github.com/ethanhs/python-wasm/issues/16 +ac_cv_lib_bz2_BZ2_bzCompress=no + +# The rest is based on pyodide +# https://github.com/pyodide/pyodide/blob/main/cpython/pyconfig.undefs.h + +ac_cv_func_epoll=no +ac_cv_func_epoll_create1=no +ac_cv_header_linux_vm_sockets_h=no +ac_cv_func_socketpair=no +ac_cv_func_utimensat=no +ac_cv_func_sigaction=no + +# Untested syscalls in emscripten +ac_cv_func_openat=no +ac_cv_func_mkdirat=no +ac_cv_func_fchownat=no +ac_cv_func_renameat=no +ac_cv_func_linkat=no +ac_cv_func_symlinkat=no +ac_cv_func_readlinkat=no +ac_cv_func_fchmodat=no +ac_cv_func_dup3=no + +# Syscalls not implemented in emscripten +ac_cv_func_preadv2=no +ac_cv_func_preadv=no +ac_cv_func_pwritev2=no +ac_cv_func_pwritev=no +ac_cv_func_pipe2=no +ac_cv_func_nice=no + +# Syscalls that resulted in a segfault +ac_cv_func_utimensat=no +ac_cv_header_sys_ioctl_h=no + +# sockets are supported, but only in non-blocking mode +# ac_cv_header_sys_socket_h=no + +# Unsupported functionality +#undef HAVE_PTHREAD_H diff --git a/Tools/wasm/wasm_assets.py b/Tools/wasm/wasm_assets.py new file mode 100755 index 0000000000000..6a4027184030f --- /dev/null +++ b/Tools/wasm/wasm_assets.py @@ -0,0 +1,174 @@ +#!/usr/bin/env python +"""Create a WASM asset bundle directory structure. + +The WASM asset bundles are pre-loaded by the final WASM build. The bundle +contains: + +- a stripped down, pyc-only stdlib zip file, e.g. {PREFIX}/lib/python311.zip +- os.py as marker module {PREFIX}/lib/python3.11/os.py +- empty lib-dynload directory, to make sure it is copied into the bundle {PREFIX}/lib/python3.11/lib-dynload/.empty +""" + +import argparse +import pathlib +import shutil +import sys +import zipfile + +# source directory +SRCDIR = pathlib.Path(__file__).parent.parent.parent.absolute() +SRCDIR_LIB = SRCDIR / "Lib" + +# sysconfig data relative to build dir. +SYSCONFIGDATA_GLOB = "build/lib.*/_sysconfigdata_*.py" + +# Library directory relative to $(prefix). +WASM_LIB = pathlib.PurePath("lib") +WASM_STDLIB_ZIP = ( + WASM_LIB / f"python{sys.version_info.major}{sys.version_info.minor}.zip" +) +WASM_STDLIB = ( + WASM_LIB / f"python{sys.version_info.major}.{sys.version_info.minor}" +) +WASM_DYNLOAD = WASM_STDLIB / "lib-dynload" + + +# Don't ship large files / packages that are not particularly useful at +# the moment. +OMIT_FILES = ( + # regression tests + "test/", + # user interfaces: TK, curses + "curses/", + "idlelib/", + "tkinter/", + "turtle.py", + "turtledemo/", + # package management + "ensurepip/", + "venv/", + # build system + "distutils/", + "lib2to3/", + # concurrency + "concurrent/", + "multiprocessing/", + # deprecated + "asyncore.py", + "asynchat.py", + # Synchronous network I/O and protocols are not supported; for example, + # socket.create_connection() raises an exception: + # "BlockingIOError: [Errno 26] Operation in progress". + "cgi.py", + "cgitb.py", + "email/", + "ftplib.py", + "http/", + "imaplib.py", + "nntplib.py", + "poplib.py", + "smtpd.py", + "smtplib.py", + "socketserver.py", + "telnetlib.py", + "urllib/", + "wsgiref/", + "xmlrpc/", + # dbm / gdbm + "dbm/", + # other platforms + "_aix_support.py", + "_bootsubprocess.py", + "_osx_support.py", + # webbrowser + "antigravity.py", + "webbrowser.py", + # ctypes + "ctypes/", + # Pure Python implementations of C extensions + "_pydecimal.py", + "_pyio.py", + # Misc unused or large files + "pydoc_data/", + "msilib/", +) + +# regression test sub directories +OMIT_SUBDIRS = ( + "ctypes/test/", + "tkinter/test/", + "unittest/test/", +) + + +OMIT_ABSOLUTE = {SRCDIR_LIB / name for name in OMIT_FILES} +OMIT_SUBDIRS_ABSOLUTE = tuple(str(SRCDIR_LIB / name) for name in OMIT_SUBDIRS) + + +def filterfunc(name: str) -> bool: + return not name.startswith(OMIT_SUBDIRS_ABSOLUTE) + + +def create_stdlib_zip( + args: argparse.Namespace, compression: int = zipfile.ZIP_DEFLATED, *, optimize: int = 0 +) -> None: + sysconfig_data = list(args.builddir.glob(SYSCONFIGDATA_GLOB)) + if not sysconfig_data: + raise ValueError("No sysconfigdata file found") + + with zipfile.PyZipFile( + args.wasm_stdlib_zip, mode="w", compression=compression, optimize=0 + ) as pzf: + for entry in sorted(args.srcdir_lib.iterdir()): + if entry.name == "__pycache__": + continue + if entry in OMIT_ABSOLUTE: + continue + if entry.name.endswith(".py") or entry.is_dir(): + # writepy() writes .pyc files (bytecode). + pzf.writepy(entry, filterfunc=filterfunc) + for entry in sysconfig_data: + pzf.writepy(entry) + + +def path(val: str) -> pathlib.Path: + return pathlib.Path(val).absolute() + + +parser = argparse.ArgumentParser() +parser.add_argument( + "--builddir", + help="absolute build directory", + default=pathlib.Path(".").absolute(), + type=path, +) +parser.add_argument( + "--prefix", help="install prefix", default=pathlib.Path("/usr/local"), type=path +) + + +def main(): + args = parser.parse_args() + + relative_prefix = args.prefix.relative_to(pathlib.Path("/")) + args.srcdir = SRCDIR + args.srcdir_lib = SRCDIR_LIB + args.wasm_root = args.builddir / relative_prefix + args.wasm_stdlib_zip = args.wasm_root / WASM_STDLIB_ZIP + args.wasm_stdlib = args.wasm_root / WASM_STDLIB + args.wasm_dynload = args.wasm_root / WASM_DYNLOAD + + # Empty, unused directory for dynamic libs, but required for site initialization. + args.wasm_dynload.mkdir(parents=True, exist_ok=True) + marker = args.wasm_dynload / ".empty" + marker.touch() + # os.py is a marker for finding the correct lib directory. + shutil.copy(args.srcdir_lib / "os.py", args.wasm_stdlib) + # The rest of stdlib that's useful in a WASM context. + create_stdlib_zip(args) + size = round(args.wasm_stdlib_zip.stat().st_size / 1024 ** 2, 2) + parser.exit(0, f"Created {args.wasm_stdlib_zip} ({size} MiB)\n") + + +if __name__ == "__main__": + main() diff --git a/configure b/configure index 1ede29989d948..eca63518dbca3 100755 --- a/configure +++ b/configure @@ -772,6 +772,7 @@ MODULE_TIME_FALSE MODULE_TIME_TRUE MODULE__IO_FALSE MODULE__IO_TRUE +MODULES_SETUP_STDLIB MODULE_BUILDTYPE TEST_MODULES LIBRARY_DEPS @@ -13298,7 +13299,13 @@ fi if test -z "$with_pymalloc" then + case $ac_sys_system in #( + Emscripten) : + with_pymalloc="no" ;; #( + *) : with_pymalloc="yes" + ;; +esac fi if test "$with_pymalloc" != "no" then @@ -21165,12 +21172,22 @@ fi if test "$enable_test_modules" = no; then TEST_MODULES=no - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } else + case $ac_sys_system in #( + Emscripten) : + TEST_MODULES=no ;; #( + *) : TEST_MODULES=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + ;; +esac +fi +if test "x$TEST_MODULES" = xyes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + fi @@ -21189,7 +21206,7 @@ case $ac_sys_system in #( py_stdlib_not_available="_scproxy spwd" ;; #( Emscripten) : - py_stdlib_not_available="_curses _curses_panel _dbm _gdbm _multiprocessing _posixshmem _posixsubprocess _scproxy _xxsubinterpreters fcntl grp nis ossaudiodev resource spwd syslog termios" + py_stdlib_not_available="_ctypes _curses _curses_panel _dbm _gdbm _multiprocessing _posixshmem _posixsubprocess _scproxy _tkinter _xxsubinterpreters fcntl grp nis ossaudiodev resource readline spwd syslog termios" ;; #( *) : py_stdlib_not_available="_scproxy" @@ -21205,6 +21222,20 @@ case $host_cpu in #( esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for additional Modules/Setup files" >&5 +$as_echo_n "checking for additional Modules/Setup files... " >&6; } +case $ac_sys_system in #( + Emscripten) : + MODULES_SETUP_STDLIB=Modules/Setup.stdlib ;; #( + *) : + MODULES_SETUP_STDLIB= + ;; +esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MODULES_SETUP_STDLIB" >&5 +$as_echo "$MODULES_SETUP_STDLIB" >&6; } + + + MODULE_BLOCK= @@ -25100,7 +25131,7 @@ fi $as_echo "$as_me: creating Makefile" >&6;} $SHELL $srcdir/Modules/makesetup -c $srcdir/Modules/config.c.in \ -s Modules \ - Modules/Setup.local $srcdir/Modules/Setup.bootstrap $srcdir/Modules/Setup + Modules/Setup.local $MODULES_SETUP_STDLIB $srcdir/Modules/Setup.bootstrap $srcdir/Modules/Setup mv config.c Modules if test -z "$PKG_CONFIG"; then diff --git a/configure.ac b/configure.ac index 86404bcadeaba..050b907ac8624 100644 --- a/configure.ac +++ b/configure.ac @@ -3865,7 +3865,11 @@ AC_ARG_WITH(pymalloc, if test -z "$with_pymalloc" then - with_pymalloc="yes" + dnl default to yes except for wasm32-emscripten + AS_CASE([$ac_sys_system], + [Emscripten], [with_pymalloc="no"], + [with_pymalloc="yes"] + ) fi if test "$with_pymalloc" != "no" then @@ -6253,11 +6257,15 @@ AC_ARG_ENABLE(test-modules, AS_HELP_STRING([--disable-test-modules], [don't build nor install test modules])) if test "$enable_test_modules" = no; then TEST_MODULES=no - AC_MSG_RESULT(yes) else - TEST_MODULES=yes - AC_MSG_RESULT(no) + AS_CASE([$ac_sys_system], + [Emscripten], [TEST_MODULES=no], + [TEST_MODULES=yes] + ) fi +AS_VAR_IF([TEST_MODULES], [yes], + [AC_MSG_RESULT(no)], [AC_MSG_RESULT(yes)] +) AC_SUBST(TEST_MODULES) dnl Modules that are not available on some platforms @@ -6272,6 +6280,7 @@ AS_CASE([$ac_sys_system], [FreeBSD*], [py_stdlib_not_available="_scproxy spwd"], [Emscripten], [ py_stdlib_not_available="m4_normalize([ + _ctypes _curses _curses_panel _dbm @@ -6280,12 +6289,14 @@ AS_CASE([$ac_sys_system], _posixshmem _posixsubprocess _scproxy + _tkinter _xxsubinterpreters fcntl grp nis ossaudiodev resource + readline spwd syslog termios @@ -6301,6 +6312,16 @@ AS_CASE([$host_cpu], ) AC_SUBST([MODULE_BUILDTYPE]) +dnl Use Modules/Setup.stdlib as additional provider? +AC_MSG_CHECKING([for additional Modules/Setup files]) +AS_CASE([$ac_sys_system], + [Emscripten], [MODULES_SETUP_STDLIB=Modules/Setup.stdlib], + [MODULES_SETUP_STDLIB=] +) +AC_MSG_RESULT([$MODULES_SETUP_STDLIB]) +AC_SUBST([MODULES_SETUP_STDLIB]) + + dnl _MODULE_BLOCK_ADD([VAR], [VALUE]) dnl internal: adds $1=quote($2) to MODULE_BLOCK AC_DEFUN([_MODULE_BLOCK_ADD], [AS_VAR_APPEND([MODULE_BLOCK], ["$1=_AS_QUOTE([$2])$as_nl"])]) @@ -6515,7 +6536,7 @@ fi AC_MSG_NOTICE([creating Makefile]) $SHELL $srcdir/Modules/makesetup -c $srcdir/Modules/config.c.in \ -s Modules \ - Modules/Setup.local $srcdir/Modules/Setup.bootstrap $srcdir/Modules/Setup + Modules/Setup.local $MODULES_SETUP_STDLIB $srcdir/Modules/Setup.bootstrap $srcdir/Modules/Setup mv config.c Modules if test -z "$PKG_CONFIG"; then

1 0

bpo-46113: Minor fixes in stdtypes documentation (GH-30167) (GH-30187)
by Fidget-Spinner Dec. 18, 2021

Dec. 18, 2021

https://github.com/python/cpython/commit/0da17eb06943a66fcd826ff591d47c22c2… commit: 0da17eb06943a66fcd826ff591d47c22c2c0595a branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: Fidget-Spinner <28750310+Fidget-Spinner(a)users.noreply.github.com> date: 2021-12-18T22:26:04+08:00 summary: bpo-46113: Minor fixes in stdtypes documentation (GH-30167) (GH-30187) * Fix-1 - isidentifier() function output * Fix-2 Update the str.splitlines() function parameter * Fix-3 Removed unwanted full stop for str and bytes types double quotes examples. * Fix-4 Updated class dict from **kwarg to **kwargs (cherry picked from commit 6f2df4295123f8b961d49474b7668f7564a534a4) Co-authored-by: Vivek Vashist <vivekvashist(a)gmail.com> files: M Doc/library/stdtypes.rst diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst index c6ac6d2c712c1..bfa0e744f2c4f 100644 --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -1404,7 +1404,7 @@ Strings are immutable written in a variety of ways: * Single quotes: ``'allows embedded "double" quotes'`` -* Double quotes: ``"allows embedded 'single' quotes"``. +* Double quotes: ``"allows embedded 'single' quotes"`` * Triple quoted: ``'''Three single quotes'''``, ``"""Three double quotes"""`` Triple quoted strings may span multiple lines - all associated whitespace will @@ -1728,9 +1728,9 @@ expression support in the :mod:`re` module). >>> from keyword import iskeyword >>> 'hello'.isidentifier(), iskeyword('hello') - True, False + (True, False) >>> 'def'.isidentifier(), iskeyword('def') - True, True + (True, True) .. method:: str.islower() @@ -1997,7 +1997,7 @@ expression support in the :mod:`re` module). .. index:: single: universal newlines; str.splitlines method -.. method:: str.splitlines([keepends]) +.. method:: str.splitlines(keepends=False) Return a list of the lines in the string, breaking at line boundaries. Line breaks are not included in the resulting list unless *keepends* is given and @@ -2410,7 +2410,7 @@ data and are closely related to string objects in a variety of other ways. literals, except that a ``b`` prefix is added: * Single quotes: ``b'still allows embedded "double" quotes'`` - * Double quotes: ``b"still allows embedded 'single' quotes"``. + * Double quotes: ``b"still allows embedded 'single' quotes"`` * Triple quoted: ``b'''3 single quotes'''``, ``b"""3 double quotes"""`` Only ASCII characters are permitted in bytes literals (regardless of the @@ -4310,9 +4310,9 @@ Dictionaries can be created by placing a comma-separated list of ``key: value`` pairs within braces, for example: ``{'jack': 4098, 'sjoerd': 4127}`` or ``{4098: 'jack', 4127: 'sjoerd'}``, or by the :class:`dict` constructor. -.. class:: dict(**kwarg) - dict(mapping, **kwarg) - dict(iterable, **kwarg) +.. class:: dict(**kwargs) + dict(mapping, **kwargs) + dict(iterable, **kwargs) Return a new dictionary initialized from an optional positional argument and a possibly empty set of keyword arguments.

1 0

bpo-37578: glob.glob -- added include_hidden parameter (GH-30153)
by miss-islington Dec. 18, 2021

Dec. 18, 2021

https://github.com/python/cpython/commit/ae36cd1e792db9d6db4c6847ec2a7d50a7… commit: ae36cd1e792db9d6db4c6847ec2a7d50a71f2b68 branch: main author: andrei kulakov <andrei.avk(a)gmail.com> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2021-12-18T06:23:34-08:00 summary: bpo-37578: glob.glob -- added include_hidden parameter (GH-30153) Automerge-Triggered-By: GH:asvetlov files: A Misc/NEWS.d/next/Library/2021-12-17-13-22-37.bpo-37578._tluuR.rst M Doc/library/glob.rst M Lib/glob.py M Lib/test/test_glob.py diff --git a/Doc/library/glob.rst b/Doc/library/glob.rst index 215f60d328c76..54621d1d12bb5 100644 --- a/Doc/library/glob.rst +++ b/Doc/library/glob.rst @@ -36,7 +36,8 @@ For example, ``'[?]'`` matches the character ``'?'``. The :mod:`pathlib` module offers high-level path objects. -.. function:: glob(pathname, *, root_dir=None, dir_fd=None, recursive=False) +.. function:: glob(pathname, *, root_dir=None, dir_fd=None, recursive=False, \ + include_hidden=False) Return a possibly-empty list of path names that match *pathname*, which must be a string containing a path specification. *pathname* can be either absolute @@ -64,6 +65,8 @@ For example, ``'[?]'`` matches the character ``'?'``. pattern is followed by an :data:`os.sep` or :data:`os.altsep` then files will not match. + If *include_hidden* is true, "``**``" pattern will match hidden directories. + .. audit-event:: glob.glob pathname,recursive glob.glob .. audit-event:: glob.glob/2 pathname,recursive,root_dir,dir_fd glob.glob @@ -77,8 +80,12 @@ For example, ``'[?]'`` matches the character ``'?'``. .. versionchanged:: 3.10 Added the *root_dir* and *dir_fd* parameters. + .. versionchanged:: 3.11 + Added the *include_hidden* parameter. + -.. function:: iglob(pathname, *, root_dir=None, dir_fd=None, recursive=False) +.. function:: iglob(pathname, *, root_dir=None, dir_fd=None, recursive=False, \ + include_hidden=False) Return an :term:`iterator` which yields the same values as :func:`glob` without actually storing them all simultaneously. @@ -92,6 +99,9 @@ For example, ``'[?]'`` matches the character ``'?'``. .. versionchanged:: 3.10 Added the *root_dir* and *dir_fd* parameters. + .. versionchanged:: 3.11 + Added the *include_hidden* parameter. + .. function:: escape(pathname) diff --git a/Lib/glob.py b/Lib/glob.py index 9fc08f45df115..a7256422d520f 100644 --- a/Lib/glob.py +++ b/Lib/glob.py @@ -10,20 +10,26 @@ __all__ = ["glob", "iglob", "escape"] -def glob(pathname, *, root_dir=None, dir_fd=None, recursive=False): +def glob(pathname, *, root_dir=None, dir_fd=None, recursive=False, + include_hidden=False): """Return a list of paths matching a pathname pattern. The pattern may contain simple shell-style wildcards a la - fnmatch. However, unlike fnmatch, filenames starting with a + fnmatch. Unlike fnmatch, filenames starting with a dot are special cases that are not matched by '*' and '?' - patterns. + patterns by default. - If recursive is true, the pattern '**' will match any files and + If `include_hidden` is true, the patterns '*', '?', '**' will match hidden + directories. + + If `recursive` is true, the pattern '**' will match any files and zero or more directories and subdirectories. """ - return list(iglob(pathname, root_dir=root_dir, dir_fd=dir_fd, recursive=recursive)) + return list(iglob(pathname, root_dir=root_dir, dir_fd=dir_fd, recursive=recursive, + include_hidden=include_hidden)) -def iglob(pathname, *, root_dir=None, dir_fd=None, recursive=False): +def iglob(pathname, *, root_dir=None, dir_fd=None, recursive=False, + include_hidden=False): """Return an iterator which yields the paths matching a pathname pattern. The pattern may contain simple shell-style wildcards a la @@ -40,7 +46,8 @@ def iglob(pathname, *, root_dir=None, dir_fd=None, recursive=False): root_dir = os.fspath(root_dir) else: root_dir = pathname[:0] - it = _iglob(pathname, root_dir, dir_fd, recursive, False) + it = _iglob(pathname, root_dir, dir_fd, recursive, False, + include_hidden=include_hidden) if not pathname or recursive and _isrecursive(pathname[:2]): try: s = next(it) # skip empty string @@ -50,7 +57,8 @@ def iglob(pathname, *, root_dir=None, dir_fd=None, recursive=False): pass return it -def _iglob(pathname, root_dir, dir_fd, recursive, dironly): +def _iglob(pathname, root_dir, dir_fd, recursive, dironly, + include_hidden=False): dirname, basename = os.path.split(pathname) if not has_magic(pathname): assert not dironly @@ -64,15 +72,18 @@ def _iglob(pathname, root_dir, dir_fd, recursive, dironly): return if not dirname: if recursive and _isrecursive(basename): - yield from _glob2(root_dir, basename, dir_fd, dironly) + yield from _glob2(root_dir, basename, dir_fd, dironly, + include_hidden=include_hidden) else: - yield from _glob1(root_dir, basename, dir_fd, dironly) + yield from _glob1(root_dir, basename, dir_fd, dironly, + include_hidden=include_hidden) return # `os.path.split()` returns the argument itself as a dirname if it is a # drive or UNC path. Prevent an infinite recursion if a drive or UNC path # contains magic characters (i.e. r'\\?\C:'). if dirname != pathname and has_magic(dirname): - dirs = _iglob(dirname, root_dir, dir_fd, recursive, True) + dirs = _iglob(dirname, root_dir, dir_fd, recursive, True, + include_hidden=include_hidden) else: dirs = [dirname] if has_magic(basename): @@ -83,20 +94,21 @@ def _iglob(pathname, root_dir, dir_fd, recursive, dironly): else: glob_in_dir = _glob0 for dirname in dirs: - for name in glob_in_dir(_join(root_dir, dirname), basename, dir_fd, dironly): + for name in glob_in_dir(_join(root_dir, dirname), basename, dir_fd, dironly, + include_hidden=include_hidden): yield os.path.join(dirname, name) # These 2 helper functions non-recursively glob inside a literal directory. # They return a list of basenames. _glob1 accepts a pattern while _glob0 # takes a literal basename (so it only has to check for its existence). -def _glob1(dirname, pattern, dir_fd, dironly): +def _glob1(dirname, pattern, dir_fd, dironly, include_hidden=False): names = _listdir(dirname, dir_fd, dironly) - if not _ishidden(pattern): - names = (x for x in names if not _ishidden(x)) + if include_hidden or not _ishidden(pattern): + names = (x for x in names if include_hidden or not _ishidden(x)) return fnmatch.filter(names, pattern) -def _glob0(dirname, basename, dir_fd, dironly): +def _glob0(dirname, basename, dir_fd, dironly, include_hidden=False): if basename: if _lexists(_join(dirname, basename), dir_fd): return [basename] @@ -118,10 +130,11 @@ def glob1(dirname, pattern): # This helper function recursively yields relative pathnames inside a literal # directory. -def _glob2(dirname, pattern, dir_fd, dironly): +def _glob2(dirname, pattern, dir_fd, dironly, include_hidden=False): assert _isrecursive(pattern) yield pattern[:0] - yield from _rlistdir(dirname, dir_fd, dironly) + yield from _rlistdir(dirname, dir_fd, dironly, + include_hidden=include_hidden) # If dironly is false, yields all file names inside a directory. # If dironly is true, yields only directory names. @@ -164,13 +177,14 @@ def _listdir(dirname, dir_fd, dironly): return list(it) # Recursively yields relative pathnames inside a literal directory. -def _rlistdir(dirname, dir_fd, dironly): +def _rlistdir(dirname, dir_fd, dironly, include_hidden=False): names = _listdir(dirname, dir_fd, dironly) for x in names: - if not _ishidden(x): + if include_hidden or not _ishidden(x): yield x path = _join(dirname, x) if dirname else x - for y in _rlistdir(path, dir_fd, dironly): + for y in _rlistdir(path, dir_fd, dironly, + include_hidden=include_hidden): yield _join(x, y) diff --git a/Lib/test/test_glob.py b/Lib/test/test_glob.py index 96db31b26814b..f4b5821f408cb 100644 --- a/Lib/test/test_glob.py +++ b/Lib/test/test_glob.py @@ -30,6 +30,7 @@ def setUp(self): self.mktemp('aab', 'F') self.mktemp('.aa', 'G') self.mktemp('.bb', 'H') + self.mktemp('.bb', '.J') self.mktemp('aaa', 'zzzF') self.mktemp('ZZZ') self.mktemp('EF') @@ -56,7 +57,9 @@ def glob(self, *parts, **kwargs): pattern = os.path.join(*parts) p = os.path.join(self.tempdir, pattern) res = glob.glob(p, **kwargs) + res2 = glob.iglob(p, **kwargs) self.assertCountEqual(glob.iglob(p, **kwargs), res) + bres = [os.fsencode(x) for x in res] self.assertCountEqual(glob.glob(os.fsencode(p), **kwargs), bres) self.assertCountEqual(glob.iglob(os.fsencode(p), **kwargs), bres) @@ -249,6 +252,17 @@ def test_escape_windows(self): def rglob(self, *parts, **kwargs): return self.glob(*parts, recursive=True, **kwargs) + def hglob(self, *parts, **kwargs): + return self.glob(*parts, include_hidden=True, **kwargs) + + def test_hidden_glob(self): + eq = self.assertSequencesEqual_noorder + l = [('aaa',), ('.aa',)] + eq(self.hglob('?aa'), self.joins(*l)) + eq(self.hglob('*aa'), self.joins(*l)) + l2 = [('.aa','G',)] + eq(self.hglob('**', 'G'), self.joins(*l2)) + def test_recursive_glob(self): eq = self.assertSequencesEqual_noorder full = [('EF',), ('ZZZ',), @@ -314,6 +328,10 @@ def test_recursive_glob(self): expect += [join('sym3', 'EF')] eq(glob.glob(join('**', 'EF'), recursive=True), expect) + rec = [('.bb','H'), ('.bb','.J'), ('.aa','G'), ('.aa',), ('.bb',)] + eq(glob.glob('**', recursive=True, include_hidden=True), + [join(*i) for i in full+rec]) + def test_glob_many_open_files(self): depth = 30 base = os.path.join(self.tempdir, 'deep') diff --git a/Misc/NEWS.d/next/Library/2021-12-17-13-22-37.bpo-37578._tluuR.rst b/Misc/NEWS.d/next/Library/2021-12-17-13-22-37.bpo-37578._tluuR.rst new file mode 100644 index 0000000000000..455d0648a94c2 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2021-12-17-13-22-37.bpo-37578._tluuR.rst @@ -0,0 +1,3 @@ +Add *include_hidden* parameter to :func:`~glob.glob` and :func:`~glob.iglob` to +match hidden files and directories when using special characters like ``*``, +``**``, ``?`` and ``[]``.

1 0

bpo-46113: Minor fixes in stdtypes documentation (GH-30167) (GH-30186)
by Fidget-Spinner Dec. 18, 2021

Dec. 18, 2021

https://github.com/python/cpython/commit/bb286d45afa6740384bab97d0da68fe571… commit: bb286d45afa6740384bab97d0da68fe571efb6ec branch: 3.10 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: Fidget-Spinner <28750310+Fidget-Spinner(a)users.noreply.github.com> date: 2021-12-18T22:12:30+08:00 summary: bpo-46113: Minor fixes in stdtypes documentation (GH-30167) (GH-30186) * Fix-1 - isidentifier() function output * Fix-2 Update the str.splitlines() function parameter * Fix-3 Removed unwanted full stop for str and bytes types double quotes examples. * Fix-4 Updated class dict from **kwarg to **kwargs (cherry picked from commit 6f2df4295123f8b961d49474b7668f7564a534a4) Co-authored-by: Vivek Vashist <vivekvashist(a)gmail.com> files: M Doc/library/stdtypes.rst diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst index e732bd8e42fb5..101bbca7be8b2 100644 --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -1425,7 +1425,7 @@ Strings are immutable written in a variety of ways: * Single quotes: ``'allows embedded "double" quotes'`` -* Double quotes: ``"allows embedded 'single' quotes"``. +* Double quotes: ``"allows embedded 'single' quotes"`` * Triple quoted: ``'''Three single quotes'''``, ``"""Three double quotes"""`` Triple quoted strings may span multiple lines - all associated whitespace will @@ -1751,9 +1751,9 @@ expression support in the :mod:`re` module). >>> from keyword import iskeyword >>> 'hello'.isidentifier(), iskeyword('hello') - True, False + (True, False) >>> 'def'.isidentifier(), iskeyword('def') - True, True + (True, True) .. method:: str.islower() @@ -2020,7 +2020,7 @@ expression support in the :mod:`re` module). .. index:: single: universal newlines; str.splitlines method -.. method:: str.splitlines([keepends]) +.. method:: str.splitlines(keepends=False) Return a list of the lines in the string, breaking at line boundaries. Line breaks are not included in the resulting list unless *keepends* is given and @@ -2433,7 +2433,7 @@ data and are closely related to string objects in a variety of other ways. literals, except that a ``b`` prefix is added: * Single quotes: ``b'still allows embedded "double" quotes'`` - * Double quotes: ``b"still allows embedded 'single' quotes"``. + * Double quotes: ``b"still allows embedded 'single' quotes"`` * Triple quoted: ``b'''3 single quotes'''``, ``b"""3 double quotes"""`` Only ASCII characters are permitted in bytes literals (regardless of the @@ -4334,9 +4334,9 @@ Dictionaries can be created by placing a comma-separated list of ``key: value`` pairs within braces, for example: ``{'jack': 4098, 'sjoerd': 4127}`` or ``{4098: 'jack', 4127: 'sjoerd'}``, or by the :class:`dict` constructor. -.. class:: dict(**kwarg) - dict(mapping, **kwarg) - dict(iterable, **kwarg) +.. class:: dict(**kwargs) + dict(mapping, **kwargs) + dict(iterable, **kwargs) Return a new dictionary initialized from an optional positional argument and a possibly empty set of keyword arguments.

1 0

bpo-46113: Minor fixes in stdtypes documentation (GH-30167)
by Fidget-Spinner Dec. 18, 2021

Dec. 18, 2021

https://github.com/python/cpython/commit/6f2df4295123f8b961d49474b7668f7564… commit: 6f2df4295123f8b961d49474b7668f7564a534a4 branch: main author: Vivek Vashist <vivekvashist(a)gmail.com> committer: Fidget-Spinner <28750310+Fidget-Spinner(a)users.noreply.github.com> date: 2021-12-18T21:52:51+08:00 summary: bpo-46113: Minor fixes in stdtypes documentation (GH-30167) * Fix#1 - isidentifier() function output * Fix#2 Update the str.splitlines() function parameter * Fix#3 Removed unwanted full stop for str and bytes types double quotes examples. * Fix#4 Updated class dict from **kwarg to **kwargs files: M Doc/library/stdtypes.rst diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst index 3c0ba94c73c6b..9d80661fdb821 100644 --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -1463,7 +1463,7 @@ Strings are immutable written in a variety of ways: * Single quotes: ``'allows embedded "double" quotes'`` -* Double quotes: ``"allows embedded 'single' quotes"``. +* Double quotes: ``"allows embedded 'single' quotes"`` * Triple quoted: ``'''Three single quotes'''``, ``"""Three double quotes"""`` Triple quoted strings may span multiple lines - all associated whitespace will @@ -1789,9 +1789,9 @@ expression support in the :mod:`re` module). >>> from keyword import iskeyword >>> 'hello'.isidentifier(), iskeyword('hello') - True, False + (True, False) >>> 'def'.isidentifier(), iskeyword('def') - True, True + (True, True) .. method:: str.islower() @@ -2058,7 +2058,7 @@ expression support in the :mod:`re` module). .. index:: single: universal newlines; str.splitlines method -.. method:: str.splitlines([keepends]) +.. method:: str.splitlines(keepends=False) Return a list of the lines in the string, breaking at line boundaries. Line breaks are not included in the resulting list unless *keepends* is given and @@ -2471,7 +2471,7 @@ data and are closely related to string objects in a variety of other ways. literals, except that a ``b`` prefix is added: * Single quotes: ``b'still allows embedded "double" quotes'`` - * Double quotes: ``b"still allows embedded 'single' quotes"``. + * Double quotes: ``b"still allows embedded 'single' quotes"`` * Triple quoted: ``b'''3 single quotes'''``, ``b"""3 double quotes"""`` Only ASCII characters are permitted in bytes literals (regardless of the @@ -4372,9 +4372,9 @@ Dictionaries can be created by placing a comma-separated list of ``key: value`` pairs within braces, for example: ``{'jack': 4098, 'sjoerd': 4127}`` or ``{4098: 'jack', 4127: 'sjoerd'}``, or by the :class:`dict` constructor. -.. class:: dict(**kwarg) - dict(mapping, **kwarg) - dict(iterable, **kwarg) +.. class:: dict(**kwargs) + dict(mapping, **kwargs) + dict(iterable, **kwargs) Return a new dictionary initialized from an optional positional argument and a possibly empty set of keyword arguments.

1 0

bpo-46099: Fix pthread_getcpuclockid test on Solaris (GH-30140) (GH-30183)
by asvetlov Dec. 18, 2021

Dec. 18, 2021

https://github.com/python/cpython/commit/4f945ad7a510ad6dde13353784e45239ed… commit: 4f945ad7a510ad6dde13353784e45239edcdc14e branch: 3.10 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: asvetlov <andrew.svetlov(a)gmail.com> date: 2021-12-18T15:49:01+02:00 summary: bpo-46099: Fix pthread_getcpuclockid test on Solaris (GH-30140) (GH-30183) Co-authored-by: Andrew Svetlov <andrew.svetlov(a)gmail.com> (cherry picked from commit 427a490c495cde8a152e938c6f02be65620e3e59) Co-authored-by: Jakub Kulík <Kulikjak(a)gmail.com> Co-authored-by: Jakub Kulík <Kulikjak(a)gmail.com> files: M Lib/test/test_time.py diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py index 875615ad51007..d89078f08f611 100644 --- a/Lib/test/test_time.py +++ b/Lib/test/test_time.py @@ -113,12 +113,13 @@ def test_pthread_getcpuclockid(self): clk_id = time.pthread_getcpuclockid(threading.get_ident()) self.assertTrue(type(clk_id) is int) # when in 32-bit mode AIX only returns the predefined constant - if not platform.system() == "AIX": - self.assertNotEqual(clk_id, time.CLOCK_THREAD_CPUTIME_ID) - elif (sys.maxsize.bit_length() > 32): - self.assertNotEqual(clk_id, time.CLOCK_THREAD_CPUTIME_ID) - else: + if platform.system() == "AIX" and (sys.maxsize.bit_length() <= 32): self.assertEqual(clk_id, time.CLOCK_THREAD_CPUTIME_ID) + # Solaris returns CLOCK_THREAD_CPUTIME_ID when current thread is given + elif sys.platform.startswith("sunos"): + self.assertEqual(clk_id, time.CLOCK_THREAD_CPUTIME_ID) + else: + self.assertNotEqual(clk_id, time.CLOCK_THREAD_CPUTIME_ID) t1 = time.clock_gettime(clk_id) t2 = time.clock_gettime(clk_id) self.assertLessEqual(t1, t2)

1 0

bpo-46099: Fix pthread_getcpuclockid test on Solaris (GH-30140)
by asvetlov Dec. 18, 2021

Dec. 18, 2021

https://github.com/python/cpython/commit/427a490c495cde8a152e938c6f02be6562… commit: 427a490c495cde8a152e938c6f02be65620e3e59 branch: main author: Jakub Kulík <Kulikjak(a)gmail.com> committer: asvetlov <andrew.svetlov(a)gmail.com> date: 2021-12-18T15:26:24+02:00 summary: bpo-46099: Fix pthread_getcpuclockid test on Solaris (GH-30140) Co-authored-by: Andrew Svetlov <andrew.svetlov(a)gmail.com> files: M Lib/test/test_time.py diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py index f98aec2651d9d..1aa5874dfe272 100644 --- a/Lib/test/test_time.py +++ b/Lib/test/test_time.py @@ -117,12 +117,13 @@ def test_pthread_getcpuclockid(self): clk_id = time.pthread_getcpuclockid(threading.get_ident()) self.assertTrue(type(clk_id) is int) # when in 32-bit mode AIX only returns the predefined constant - if not platform.system() == "AIX": - self.assertNotEqual(clk_id, time.CLOCK_THREAD_CPUTIME_ID) - elif (sys.maxsize.bit_length() > 32): - self.assertNotEqual(clk_id, time.CLOCK_THREAD_CPUTIME_ID) - else: + if platform.system() == "AIX" and (sys.maxsize.bit_length() <= 32): self.assertEqual(clk_id, time.CLOCK_THREAD_CPUTIME_ID) + # Solaris returns CLOCK_THREAD_CPUTIME_ID when current thread is given + elif sys.platform.startswith("sunos"): + self.assertEqual(clk_id, time.CLOCK_THREAD_CPUTIME_ID) + else: + self.assertNotEqual(clk_id, time.CLOCK_THREAD_CPUTIME_ID) t1 = time.clock_gettime(clk_id) t2 = time.clock_gettime(clk_id) self.assertLessEqual(t1, t2)

1 0