From: Yuxin Wu <ppwwyyxxc@gmail.com>
Date: Wed, 3 May 2023 23:26:39 +0000 (+0800)
Subject: pydoc.safeimport: Use importlib.import_module instead of __import__ (GH-103118)
X-Git-Tag: v3.12.0b1~297
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e95dd40aff35775efce4c03bec7d82f03711310b;p=thirdparty%2FPython%2Fcpython.git

pydoc.safeimport: Use importlib.import_module instead of __import__ (GH-103118)
---

diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index b10a5da99402..84e673a7f87f 100755
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -448,7 +448,7 @@ def safeimport(path, forceload=0, cache={}):
                     # Prevent garbage collection.
                     cache[key] = sys.modules[key]
                     del sys.modules[key]
-        module = __import__(path)
+        module = importlib.import_module(path)
     except BaseException as err:
         # Did the error occur before or after the module was found?
         if path in sys.modules:
@@ -463,9 +463,6 @@ def safeimport(path, forceload=0, cache={}):
         else:
             # Some other error occurred during the importing process.
             raise ErrorDuringImport(path, err)
-    for part in path.split('.')[1:]:
-        try: module = getattr(module, part)
-        except AttributeError: return None
     return module
 
 # ---------------------------------------------------- formatter base class