Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 10 additions & 2 deletions Lib/annotationlib.py
Original file line number Diff line number Diff line change
Expand Up @@ -1090,9 +1090,17 @@ def type_repr(value):

"""
if isinstance(value, (type, types.FunctionType, types.BuiltinFunctionType)):
if value.__module__ == "builtins":
module = value.__module__
if module is None:
# Built-in methods have __module__ set to None; recover the module
# from the bound object (the class itself for class-bound methods).
obj = getattr(value, "__self__", None)
if obj is not None:
cls = obj if isinstance(obj, type) else type(obj)
module = cls.__module__
if module is None or module == "builtins":
return value.__qualname__
return f"{value.__module__}.{value.__qualname__}"
return f"{module}.{value.__qualname__}"
elif isinstance(value, _Template):
tree = _template_to_ast(value)
return ast.unparse(tree)
Expand Down
12 changes: 12 additions & 0 deletions Lib/test/test_annotationlib.py
Original file line number Diff line number Diff line change
Expand Up @@ -1850,6 +1850,18 @@ def nested():
type_repr(nested), f"{__name__}.TestTypeRepr.test_type_repr.<locals>.nested"
)
self.assertEqual(type_repr(len), "len")
# gh-152692: built-in methods have __module__ set to None
self.assertEqual(type_repr([].append), "list.append")
self.assertEqual(type_repr((1).bit_length), "int.bit_length")
self.assertEqual(type_repr(dict.fromkeys), "dict.fromkeys")
# Methods of extension types also have __module__ set to None, but
# are not in the builtins module.
import datetime
self.assertEqual(
type_repr(datetime.datetime(2000, 1, 1).isoformat),
"datetime.datetime.isoformat",
)
self.assertEqual(type_repr(datetime.date.today), "datetime.date.today")
self.assertEqual(type_repr(type_repr), "annotationlib.type_repr")
self.assertEqual(type_repr(times_three), f"{__name__}.times_three")
self.assertEqual(type_repr(...), "...")
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Fix :func:`annotationlib.type_repr` returning a string such as
``None.list.append`` for bound built-in methods, whose ``__module__`` is
``None``. It now returns the qualified name, as it already did for other
builtins.
Loading