]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
[3.12] gh-117692: Fix `AttributeError` in `DocTestFinder` on wrapped `builtin_or_meth...
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Wed, 10 Apr 2024 14:17:15 +0000 (16:17 +0200)
committerGitHub <noreply@github.com>
Wed, 10 Apr 2024 14:17:15 +0000 (14:17 +0000)
* gh-117692: Fix `AttributeError` in `DocTestFinder` on wrapped `builtin_or_method` (GH-117699)
(cherry picked from commit 4bb7d121bc0a3fd00a3c72cd915b5dd8fac5616e)

Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
Lib/doctest.py
Lib/test/test_doctest/test_doctest.py
Misc/NEWS.d/next/Library/2024-04-09-23-22-21.gh-issue-117692.EciInD.rst [new file with mode: 0644]

index 696bb966549255038eef9bec12d79846cf592c6a..d617d96a35a85af7211deb157bb7e97cbf7815a2 100644 (file)
@@ -1124,7 +1124,14 @@ 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 = 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):
index 9c8a8ba690d5570445c8d9d76625728212ff3d17..2722661a2363fe9f217355318bda55167d29c1e9 100644 (file)
@@ -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
 
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 (file)
index 0000000..98a6e12
--- /dev/null
@@ -0,0 +1,2 @@
+Fixes a bug when :class:`doctest.DocTestFinder` was failing on wrapped
+``builtin_function_or_method``.