From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Tue, 4 Feb 2025 14:44:02 +0000 (+0100)
Subject: [3.12] gh-128772: Fix pydoc for methods with __module__ is None (GH-129177) (GH-129654)
X-Git-Tag: v3.12.10~242^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0d207c3dd10766d44436126f4be2cdd65f9ef9a5;p=thirdparty%2FPython%2Fcpython.git

[3.12] gh-128772: Fix pydoc for methods with __module__ is None (GH-129177) (GH-129654)

(cherry picked from commit 979d76620990e6f8d68fa63e0ae0db1ec5b4d14c)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
---

diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index 9dfa87b2a823..b58bcf0e22a6 100755
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -210,7 +210,7 @@ def parentname(object, modname):
     if necessary) or module."""
     if '.' in object.__qualname__:
         name = object.__qualname__.rpartition('.')[0]
-        if object.__module__ != modname:
+        if object.__module__ != modname and object.__module__ is not None:
             return object.__module__ + '.' + name
         else:
             return name
diff --git a/Lib/test/test_pydoc/module_none.py b/Lib/test/test_pydoc/module_none.py
new file mode 100644
index 000000000000..ebb50fc86e2c
--- /dev/null
+++ b/Lib/test/test_pydoc/module_none.py
@@ -0,0 +1,8 @@
+def func():
+    pass
+func.__module__ = None
+
+class A:
+    def method(self):
+        pass
+    method.__module__ = None
diff --git a/Lib/test/test_pydoc/test_pydoc.py b/Lib/test/test_pydoc/test_pydoc.py
index 8261c8561a1d..79f43abd6e4d 100644
--- a/Lib/test/test_pydoc/test_pydoc.py
+++ b/Lib/test/test_pydoc/test_pydoc.py
@@ -1592,6 +1592,11 @@ foo
             html
         )
 
+    def test_module_none(self):
+        # Issue #128772
+        from test.test_pydoc import module_none
+        pydoc.render_doc(module_none)
+
 
 class PydocFodderTest(unittest.TestCase):
     def tearDown(self):
diff --git a/Misc/NEWS.d/next/Library/2025-01-22-13-29-06.gh-issue-128772.6YrxYM.rst b/Misc/NEWS.d/next/Library/2025-01-22-13-29-06.gh-issue-128772.6YrxYM.rst
new file mode 100644
index 000000000000..53d6b3ccaffd
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2025-01-22-13-29-06.gh-issue-128772.6YrxYM.rst
@@ -0,0 +1,2 @@
+Fix :mod:`pydoc` for methods with the ``__module__`` attribute equal to
+``None``.