Skip to content

Commit 0622839

Browse files
authored
gh-112414: Fix AttributeError when calling repr() on a namespace package imported with a custom loader (#112425)
1 parent e954ac7 commit 0622839

File tree

4 files changed

+16
-3
lines changed

4 files changed

+16
-3
lines changed

Lib/importlib/_bootstrap.py

+8-2
Original file line numberDiff line numberDiff line change
@@ -824,10 +824,16 @@ def _module_repr_from_spec(spec):
824824
"""Return the repr to use for the module."""
825825
name = '?' if spec.name is None else spec.name
826826
if spec.origin is None:
827-
if spec.loader is None:
827+
loader = spec.loader
828+
if loader is None:
828829
return f'<module {name!r}>'
830+
elif (
831+
_bootstrap_external is not None
832+
and isinstance(loader, _bootstrap_external.NamespaceLoader)
833+
):
834+
return f'<module {name!r} (namespace) from {list(loader._path)}>'
829835
else:
830-
return f'<module {name!r} (namespace) from {list(spec.loader._path)}>'
836+
return f'<module {name!r} ({loader!r})>'
831837
else:
832838
if spec.has_location:
833839
return f'<module {name!r} from {spec.origin!r}>'

Lib/test/test_importlib/import_/test___loader__.py

+4
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ def test___loader__(self):
2323
with util.uncache('blah'), util.import_state(meta_path=[loader]):
2424
module = self.__import__('blah')
2525
self.assertEqual(loader, module.__loader__)
26+
expected_repr_pattern = (
27+
r"<module 'blah' \(<test\.test_importlib\..*SpecLoaderMock object at .+>\)>"
28+
)
29+
self.assertRegex(repr(module), expected_repr_pattern)
2630

2731

2832
(Frozen_SpecTests,

Lib/test/test_importlib/test_namespace_pkgs.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def test_cant_import_other(self):
8080

8181
def test_simple_repr(self):
8282
import foo.one
83-
assert repr(foo).startswith("<module 'foo' (namespace) from [")
83+
self.assertTrue(repr(foo).startswith("<module 'foo' (namespace) from ["))
8484

8585

8686
class DynamicPathNamespacePackage(NamespacePackageTest):
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Fix regression in Python 3.12 where calling :func:`repr` on a module that
2+
had been imported using a custom :term:`loader` could fail with
3+
:exc:`AttributeError`. Patch by Alex Waygood.

0 commit comments

Comments
 (0)