From: Adam Turner <9087854+AA-Turner@users.noreply.github.com>
Date: Sat, 22 Feb 2025 21:06:13 +0000 (+0000)
Subject: [3.12] Docs: Test presence of optional extensions with importlib (GH-130445) (#130466)
X-Git-Tag: v3.12.10~172
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ac455678e7c9f12e9cdbdf5d31667cd12974ca92;p=thirdparty%2FPython%2Fcpython.git

[3.12] Docs: Test presence of optional extensions with importlib (GH-130445) (#130466)

* [3.12] Docs: Test presence of optional extensions with importlib (GH-130445)
(cherry picked from commit 3cc9e867eba1ed139cf28c74b4a788bcc4801394)

Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>
---

diff --git a/Doc/conf.py b/Doc/conf.py
index 023b2ace21dd..42442742f657 100644
--- a/Doc/conf.py
+++ b/Doc/conf.py
@@ -6,9 +6,10 @@
 # The contents of this file are pickled, so don't put values in the namespace
 # that aren't pickleable (module imports are okay, they're removed automatically).
 
-import importlib
 import os
 import sys
+from importlib import import_module
+from importlib.util import find_spec
 
 # Make our custom extensions available to Sphinx
 sys.path.append(os.path.abspath('tools/extensions'))
@@ -36,14 +37,15 @@ extensions = [
     'sphinx.ext.extlinks',
 ]
 
-# Skip if downstream redistributors haven't installed it
-try:
-    import sphinxext.opengraph  # noqa: F401
-except ImportError:
-    pass
-else:
-    extensions.append('sphinxext.opengraph')
-
+# Skip if downstream redistributors haven't installed them
+_OPTIONAL_EXTENSIONS = ('sphinxext.opengraph',)
+for optional_ext in _OPTIONAL_EXTENSIONS:
+    try:
+        if find_spec(optional_ext) is not None:
+            extensions.append(optional_ext)
+    except (ImportError, ValueError):
+        pass
+del _OPTIONAL_EXTENSIONS
 
 doctest_global_setup = '''
 try:
@@ -66,7 +68,7 @@ copyright = "2001-%Y, Python Software Foundation"
 # We look for the Include/patchlevel.h file in the current Python source tree
 # and replace the values accordingly.
 # See Doc/tools/extensions/patchlevel.py
-version, release = importlib.import_module('patchlevel').get_version_info()
+version, release = import_module('patchlevel').get_version_info()
 
 rst_epilog = f"""
 .. |python_version_literal| replace:: ``Python {version}``