Skip to content

[3.12] gh-117692: Fix AttributeError in DocTestFinder on wrapped builtin_or_method (GH-117699) #117708

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
AlexWaygood merged 3 commits into from
Apr 10, 2024
Merged

[3.12] gh-117692: Fix AttributeError in DocTestFinder on wrapped builtin_or_method (GH-117699) #117708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7aea2ee
gh-117692: Fix `AttributeError` in `DocTestFinder` on wrapped `builti…
sobolevn Apr 10, 2024
2410d2a
Update test_doctest.py
sobolevn Apr 10, 2024
fd446ad
Update test_doctest.py
AlexWaygood Apr 10, 2024
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
9 changes: 8 additions & 1 deletion Lib/doctest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1124,7 +1124,14 @@ def _find_lineno(self, obj, source_lines):
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 = inspect.unwrap(obj).__code__
obj = inspect.unwrap(obj)
try:
obj = obj.__code__
except AttributeError:
# Functions implemented in C don't necessarily
# have a __code__ attribute.
# If there's no code, there's no lineno
return None
if inspect.istraceback(obj): obj = obj.tb_frame
if inspect.isframe(obj): obj = obj.f_code
if inspect.iscode(obj):
Expand Down
14 changes: 14 additions & 0 deletions Lib/test/test_doctest/test_doctest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2496,6 +2496,20 @@ def test_look_in_unwrapped():
'one other test'
"""

if support.check_impl_detail(cpython=True):
def test_wrapped_c_func():
"""
# https://github.com/python/cpython/issues/117692
>>> import binascii
>>> from test.test_doctest.decorator_mod import decorator

>>> c_func_wrapped = decorator(binascii.b2a_hex)
>>> tests = doctest.DocTestFinder(exclude_empty=False).find(c_func_wrapped)
>>> for test in tests:
... print(test.lineno, test.name)
None b2a_hex
"""

def test_unittest_reportflags():
"""Default unittest reporting flags can be set to control reporting

Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2024-04-09-23-22-21.gh-issue-117692.EciInD.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fixes a bug when :class:`doctest.DocTestFinder` was failing on wrapped
``builtin_function_or_method``.