From dbee142a0175bb4717be2d96069bf21c01e532ce Mon Sep 17 00:00:00 2001 From: Jelle Zijlstra Date: Mon, 5 May 2025 19:20:11 -0700 Subject: gh-132493: Avoid eager evaluation of annotations in `@reprlib.recursive_repr()` (#133411) --- Lib/reprlib.py | 2 +- Lib/test/test_reprlib.py | 17 ++++++++++++++++- .../2025-05-04-16-37-28.gh-issue-132493.5yjZ75.rst | 2 ++ 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 Misc/NEWS.d/next/Library/2025-05-04-16-37-28.gh-issue-132493.5yjZ75.rst diff --git a/Lib/reprlib.py b/Lib/reprlib.py index 19dbe3a..441d1be 100644 --- a/Lib/reprlib.py +++ b/Lib/reprlib.py @@ -28,7 +28,7 @@ def recursive_repr(fillvalue='...'): wrapper.__doc__ = getattr(user_function, '__doc__') wrapper.__name__ = getattr(user_function, '__name__') wrapper.__qualname__ = getattr(user_function, '__qualname__') - wrapper.__annotations__ = getattr(user_function, '__annotations__', {}) + wrapper.__annotate__ = getattr(user_function, '__annotate__', None) wrapper.__type_params__ = getattr(user_function, '__type_params__', ()) wrapper.__wrapped__ = user_function return wrapper diff --git a/Lib/test/test_reprlib.py b/Lib/test/test_reprlib.py index ffeb1fb..ffad350 100644 --- a/Lib/test/test_reprlib.py +++ b/Lib/test/test_reprlib.py @@ -3,6 +3,7 @@ Nick Mathewson """ +import annotationlib import sys import os import shutil @@ -11,7 +12,7 @@ import importlib.util import unittest import textwrap -from test.support import verbose +from test.support import verbose, EqualToForwardRef from test.support.os_helper import create_empty_file from reprlib import repr as r # Don't shadow builtin repr from reprlib import Repr @@ -829,5 +830,19 @@ class TestRecursiveRepr(unittest.TestCase): self.assertEqual(type_params[0].__name__, 'T') self.assertEqual(type_params[0].__bound__, str) + def test_annotations(self): + class My: + @recursive_repr() + def __repr__(self, default: undefined = ...): + return default + + annotations = annotationlib.get_annotations( + My.__repr__, format=annotationlib.Format.FORWARDREF + ) + self.assertEqual( + annotations, + {'default': EqualToForwardRef("undefined", owner=My.__repr__)} + ) + if __name__ == "__main__": unittest.main() diff --git a/Misc/NEWS.d/next/Library/2025-05-04-16-37-28.gh-issue-132493.5yjZ75.rst b/Misc/NEWS.d/next/Library/2025-05-04-16-37-28.gh-issue-132493.5yjZ75.rst new file mode 100644 index 0000000..8d0b483 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2025-05-04-16-37-28.gh-issue-132493.5yjZ75.rst @@ -0,0 +1,2 @@ +Avoid eagerly evaluating annotations in functions decorated with +:func:`reprlib.recursive_repr`. -- cgit v0.12