Load all themes defined via entry points

Author: AA-Turner

CHANGES.rst

@@ -4,6 +4,8 @@ Release 7.3.2 (in development)
 Bugs fixed
 ----------
 
+* Preload all themes defined via entry points.
+  Patch by Adam Turner.
 
 Release 7.3.1 (released Apr 17, 2024)
 =====================================

sphinx/theming.py

@@ -159,6 +159,7 @@ def __init__(self, app: Sphinx) -> None:
         self._load_builtin_themes()
         if getattr(app.config, 'html_theme_path', None):
             self._load_additional_themes(app.config.html_theme_path)
+        self._load_entry_point_themes()
 
     def _load_builtin_themes(self) -> None:
         """Load built-in themes."""
@@ -174,17 +175,14 @@ def _load_additional_themes(self, theme_paths: str) -> None:
             for name, theme in themes.items():
                 self._themes[name] = theme
 
-    def _load_extra_theme(self, name: str) -> None:
+    def _load_entry_point_themes(self) -> None:
         """Try to load a theme with the specified name.
 
         This uses the ``sphinx.html_themes`` entry point from package metadata.
         """
-        theme_entry_points = entry_points(group='sphinx.html_themes')
-        try:
-            entry_point = theme_entry_points[name]
-        except KeyError:
-            pass
-        else:
+        for entry_point in entry_points(group='sphinx.html_themes'):
+            if entry_point.name in self._themes:
+                continue  # don't overwrite loaded themes
             self._app.registry.load_extension(self._app, entry_point.module)
             _config_post_init(self._app, self._app.config)
 
@@ -219,9 +217,6 @@ def _find_themes(theme_path: str) -> dict[str, str]:
 
     def create(self, name: str) -> Theme:
         """Create an instance of theme."""
-        if name not in self._themes:
-            self._load_extra_theme(name)
-
         if name not in self._themes:
             raise ThemeError(__('no theme named %r found (missing theme.toml?)') % name)