From 77d5433d18d357dd88068fa57ceceb6720d277c9 Mon Sep 17 00:00:00 2001 From: sobolevn Date: Tue, 9 Apr 2024 23:28:39 +0300 Subject: [PATCH 1/2] gh-117692: Fix `AttributeError` in `DocTestFinder` on wrapped `builtin_or_method` --- Lib/doctest.py | 4 +++- Lib/test/test_doctest/test_doctest.py | 14 ++++++++++++++ .../2024-04-09-23-22-21.gh-issue-117692.EciInD.rst | 2 ++ 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 Misc/NEWS.d/next/Library/2024-04-09-23-22-21.gh-issue-117692.EciInD.rst diff --git a/Lib/doctest.py b/Lib/doctest.py index fc0da590018b40..51a54d38d44c81 100644 --- a/Lib/doctest.py +++ b/Lib/doctest.py @@ -1140,7 +1140,9 @@ 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 = getattr(inspect.unwrap(obj), '__code__', None) + if obj is None: + return None # if there's no code, there's no lineno if inspect.istraceback(obj): obj = obj.tb_frame if inspect.isframe(obj): obj = obj.f_code if inspect.iscode(obj): diff --git a/Lib/test/test_doctest/test_doctest.py b/Lib/test/test_doctest/test_doctest.py index 0a2a016fff13e5..f71d62cc174d6b 100644 --- a/Lib/test/test_doctest/test_doctest.py +++ b/Lib/test/test_doctest/test_doctest.py @@ -2553,6 +2553,20 @@ def test_look_in_unwrapped(): 'one other test' """ +@doctest_skip_if(support.check_impl_detail(cpython=False)) +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 diff --git a/Misc/NEWS.d/next/Library/2024-04-09-23-22-21.gh-issue-117692.EciInD.rst b/Misc/NEWS.d/next/Library/2024-04-09-23-22-21.gh-issue-117692.EciInD.rst new file mode 100644 index 00000000000000..98a6e125c440ef --- /dev/null +++ b/Misc/NEWS.d/next/Library/2024-04-09-23-22-21.gh-issue-117692.EciInD.rst @@ -0,0 +1,2 @@ +Fixes a bug when :class:`doctest.DocTestFinder` was failing on wrapped +``builtin_function_or_method``. From 7425043b33ba3ad8b25ebe24c9ef5433c77bef9b Mon Sep 17 00:00:00 2001 From: Nikita Sobolev Date: Wed, 10 Apr 2024 12:20:05 +0300 Subject: [PATCH 2/2] Update Lib/doctest.py Co-authored-by: Alex Waygood --- Lib/doctest.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Lib/doctest.py b/Lib/doctest.py index 51a54d38d44c81..4e362cbb9c9d6b 100644 --- a/Lib/doctest.py +++ b/Lib/doctest.py @@ -1140,9 +1140,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 = getattr(inspect.unwrap(obj), '__code__', None) - if obj is None: - return None # if there's no code, there's no lineno + 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):