gh-115392: Fix doctest reporting incorrect line numbers for decorated functions (#115440)

This commit is contained in:
Brian Schubert 2024-02-14 10:01:27 -05:00 committed by GitHub
parent 6755c4e0c8
commit bb791c7728
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 23 additions and 1 deletions

View File

@ -1140,7 +1140,7 @@ class DocTestFinder:
obj = obj.fget
if inspect.isfunction(obj) and getattr(obj, '__doc__', None):
# We don't use `docstring` var here, because `obj` can be changed.
obj = obj.__code__
obj = inspect.unwrap(obj).__code__
if inspect.istraceback(obj): obj = obj.tb_frame
if inspect.isframe(obj): obj = obj.f_code
if inspect.iscode(obj):

View File

@ -0,0 +1,10 @@
# This module is used in `doctest_lineno.py`.
import functools
def decorator(f):
@functools.wraps(f)
def inner():
return f()
return inner

View File

@ -67,3 +67,12 @@ class MethodWrapper:
# https://github.com/python/cpython/issues/99433
str_wrapper = object().__str__
# https://github.com/python/cpython/issues/115392
from test.test_doctest.decorator_mod import decorator
@decorator
@decorator
def func_with_docstring_wrapped():
"""Some unrelated info."""

View File

@ -685,6 +685,7 @@ It used to be broken for quite some time until `bpo-28249`.
None test.test_doctest.doctest_lineno.MethodWrapper.method_without_docstring
61 test.test_doctest.doctest_lineno.MethodWrapper.property_with_doctest
4 test.test_doctest.doctest_lineno.func_with_docstring
77 test.test_doctest.doctest_lineno.func_with_docstring_wrapped
12 test.test_doctest.doctest_lineno.func_with_doctest
None test.test_doctest.doctest_lineno.func_without_docstring

View File

@ -0,0 +1,2 @@
Fix a bug in :mod:`doctest` where incorrect line numbers would be
reported for decorated functions.