Skip to content

GH-102700: allow built-in modules to be submodules #103162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brettcannon merged 6 commits into from
Apr 6, 2023
Merged

GH-102700: allow built-in modules to be submodules #103162

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
84c590c
GH-102700: allow built-in modules to be submodules
brettcannon Apr 1, 2023
197422b
Add a news entry
brettcannon Apr 1, 2023
5d5b934
Revert changes made by Black
brettcannon Apr 4, 2023
4e7a034
Merge branch 'main' into builtin-submodules
brettcannon Apr 4, 2023
7bb418f
Update news entry to be more descriptive
brettcannon Apr 6, 2023
f0a4342
Merge branch 'python:main' into builtin-submodules
brettcannon Apr 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Lib/importlib/_bootstrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -887,8 +887,6 @@ class BuiltinImporter:

@classmethod
def find_spec(cls, fullname, path=None, target=None):
if path is not None:
return None
if _imp.is_builtin(fullname):
return spec_from_loader(fullname, cls, origin=cls._ORIGIN)
else:
Expand Down
51 changes: 18 additions & 33 deletions Lib/test/test_importlib/builtin/test_finder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
from test.test_importlib import abc, util

machinery = util.import_importlib('importlib.machinery')
machinery = util.import_importlib("importlib.machinery")
Comment thread
brettcannon marked this conversation as resolved.
Outdated

import sys
import unittest
import warnings


@unittest.skipIf(util.BUILTINS.good_name is None, 'no reasonable builtin module')
@unittest.skipIf(util.BUILTINS.good_name is None, "no reasonable builtin module")
class FindSpecTests(abc.FinderTests):

"""Test find_spec() for built-in modules."""
Expand All @@ -17,7 +17,7 @@ def test_module(self):
with util.uncache(util.BUILTINS.good_name):
found = self.machinery.BuiltinImporter.find_spec(util.BUILTINS.good_name)
self.assertTrue(found)
self.assertEqual(found.origin, 'built-in')
self.assertEqual(found.origin, "built-in")

# Built-in modules cannot be a package.
test_package = None
Expand All @@ -32,25 +32,18 @@ def test_module(self):
test_package_over_module = None

def test_failure(self):
name = 'importlib'
name = "importlib"
assert name not in sys.builtin_module_names
spec = self.machinery.BuiltinImporter.find_spec(name)
self.assertIsNone(spec)

def test_ignore_path(self):
# The value for 'path' should always trigger a failed import.
with util.uncache(util.BUILTINS.good_name):
spec = self.machinery.BuiltinImporter.find_spec(util.BUILTINS.good_name,
['pkg'])
self.assertIsNone(spec)


(Frozen_FindSpecTests,
Source_FindSpecTests
) = util.test_both(FindSpecTests, machinery=machinery)
(Frozen_FindSpecTests, Source_FindSpecTests) = util.test_both(
FindSpecTests, machinery=machinery
)


@unittest.skipIf(util.BUILTINS.good_name is None, 'no reasonable builtin module')
@unittest.skipIf(util.BUILTINS.good_name is None, "no reasonable builtin module")
class FinderTests(abc.FinderTests):

"""Test find_module() for built-in modules."""
Expand All @@ -60,9 +53,11 @@ def test_module(self):
with util.uncache(util.BUILTINS.good_name):
with warnings.catch_warnings():
warnings.simplefilter("ignore", DeprecationWarning)
found = self.machinery.BuiltinImporter.find_module(util.BUILTINS.good_name)
found = self.machinery.BuiltinImporter.find_module(
util.BUILTINS.good_name
)
self.assertTrue(found)
self.assertTrue(hasattr(found, 'load_module'))
self.assertTrue(hasattr(found, "load_module"))

# Built-in modules cannot be a package.
test_package = test_package_in_package = test_package_over_module = None
Expand All @@ -71,27 +66,17 @@ def test_module(self):
test_module_in_package = None

def test_failure(self):
assert 'importlib' not in sys.builtin_module_names
assert "importlib" not in sys.builtin_module_names
with warnings.catch_warnings():
warnings.simplefilter("ignore", DeprecationWarning)
loader = self.machinery.BuiltinImporter.find_module('importlib')
loader = self.machinery.BuiltinImporter.find_module("importlib")
self.assertIsNone(loader)

def test_ignore_path(self):
# The value for 'path' should always trigger a failed import.
with util.uncache(util.BUILTINS.good_name):
with warnings.catch_warnings():
warnings.simplefilter("ignore", DeprecationWarning)
loader = self.machinery.BuiltinImporter.find_module(
util.BUILTINS.good_name,
['pkg'])
self.assertIsNone(loader)


(Frozen_FinderTests,
Source_FinderTests
) = util.test_both(FinderTests, machinery=machinery)
(Frozen_FinderTests, Source_FinderTests) = util.test_both(
FinderTests, machinery=machinery
)


if __name__ == '__main__':
if __name__ == "__main__":
unittest.main()
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Core and Builtins/2023-04-01-00-46-31.gh-issue-102700.493NB4.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
All built-in modules to be submodules.