gh-99433: Fix `doctest` failure on `types.MethodWrapperType` (GH-99434)

(cherry picked from commit 79c10b7da84f52999dc483fc62c8e758ad3eff23)

Co-authored-by: Nikita Sobolev <mail@sobolevn.me>

diff --git a/Lib/doctest.py b/Lib/doctest.py
index b2ef2ce63672ebdc4ed83001f421bbc3711acbf5..dafad505ef0e86a11b289da0ae7a9b01ae966e84 100644 (file)
--- a/Lib/doctest.py
+++ b/Lib/doctest.py
@@ -956,7 +956,8 @@ class DocTestFinder:
             return module is inspect.getmodule(object)
         elif inspect.isfunction(object):
             return module.__dict__ is object.__globals__
-        elif inspect.ismethoddescriptor(object):
+        elif (inspect.ismethoddescriptor(object) or
+              inspect.ismethodwrapper(object)):
             if hasattr(object, '__objclass__'):
                 obj_mod = object.__objclass__.__module__
             elif hasattr(object, '__module__'):

diff --git a/Lib/test/doctest_lineno.py b/Lib/test/doctest_lineno.py
index be198513a1502ca97843ca6dc10fe9d58336cf59..729a68aceaa99013f527ce0e5dce3f183c6a5a95 100644 (file)
--- a/Lib/test/doctest_lineno.py
+++ b/Lib/test/doctest_lineno.py
@@ -48,3 +48,6 @@ class MethodWrapper:
         >>> MethodWrapper.method_with_doctest.__name__
         'method_with_doctest'
         """
+
+# https://github.com/python/cpython/issues/99433
+str_wrapper = object().__str__

diff --git a/Misc/NEWS.d/next/Library/2022-11-13-15-32-19.gh-issue-99433.Ys6y0A.rst b/Misc/NEWS.d/next/Library/2022-11-13-15-32-19.gh-issue-99433.Ys6y0A.rst
new file mode 100644 (file)
index 0000000..8e13a9a
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-11-13-15-32-19.gh-issue-99433.Ys6y0A.rst
@@ -0,0 +1 @@
+Fix :mod:`doctest` failure on :class:`types.MethodWrapperType` in modules.