Skip to content

gh-93334: Fix homonym edge case in PathFinder.find_spec() #98100

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 14 commits into from
Sep 5, 2025
Merged

gh-93334: Fix homonym edge case in PathFinder.find_spec() #98100

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
17ddcd0
gh-93334: Fix homonym edge case in PathFinder.find_spec
jacobtylerwalls Oct 8, 2022
7ee7ebe
fixup! Fix homonym edge case
jacobtylerwalls Oct 8, 2022
ef08ec0
Merge branch 'main' into homonym-find-spec
jacobtylerwalls Apr 8, 2023
c525fb0
Merge branch 'main' into homonym-find-spec
jacobtylerwalls Feb 24, 2024
8092f01
Update expected result
jacobtylerwalls Feb 24, 2024
d0f5a82
Fix expected result
jacobtylerwalls Feb 24, 2024
78a1232
fix failing test
jacobtylerwalls Feb 24, 2024
efb61c1
reuse string
jacobtylerwalls Feb 24, 2024
1369c60
Merge branch 'main' into homonym-find-spec
jacobtylerwalls Jul 13, 2024
7b77fac
Raise ModuleNotFoundError, update news and tests
jacobtylerwalls Jul 13, 2024
1d59e5c
Let build know about new test package
jacobtylerwalls Jul 13, 2024
3910d92
Merge branch 'main' into homonym-find-spec
brettcannon Sep 13, 2024
fd24f87
Address review
jacobtylerwalls Sep 15, 2024
5a8fafb
Merge branch 'main' into homonym-find-spec
brettcannon Sep 5, 2025
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
Prev Previous commit
Next Next commit
Update expected result
  • Loading branch information
@jacobtylerwalls
jacobtylerwalls committed Feb 24, 2024
commit 8092f01e04d6ce32b7fd61c4a461d7aa84d43e73
8 changes: 6 additions & 2 deletions Lib/importlib/_bootstrap_external.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1358,7 +1358,7 @@ def __init__(self, name, path, path_finder):
def _find_parent_path_names(self):
"""Returns a tuple of (parent-module-name, parent-path-attr-name)"""
parent, dot, me = self._name.rpartition('.')
if dot == '' or parent not in sys.modules:
if dot == '':
# This is a top-level module. sys.path contains the parent path.
return 'sys', 'path'
# Not a top-level module. parent-module.__path__ contains the
Expand All @@ -1367,7 +1367,11 @@ def _find_parent_path_names(self):

def _get_parent_path(self):
parent_module_name, path_attr_name = self._find_parent_path_names()
return getattr(sys.modules[parent_module_name], path_attr_name)
try:
module = sys.modules[parent_module_name]
except KeyError:
return None
return getattr(module, path_attr_name)
Comment thread
brettcannon marked this conversation as resolved.
Outdated

def _recalculate(self):
# If the parent's path has changed, recalculate _path
Expand Down
4 changes: 2 additions & 2 deletions Lib/test/test_importlib/test_namespace_pkgs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,9 +325,9 @@ class DirectoryHomonym(NamespacePackageTest):
def test_namespace_package_submodule_homonym(self):
submodule_path = 'project4.homonym'
got = importlib.machinery.PathFinder.find_spec(submodule_path)
self.assertEqual(got.name, submodule_path)
self.assertEqual(got.name, 'homonym')
self.assertIsNone(got.loader)
self.assertTrue(got.submodule_search_locations[0].endswith('homonym'))
self.assertNotIn('project4', got.submodule_search_locations[0])


class ReloadTests(NamespacePackageTest):
Expand Down