Prefer ``importlib.metadata`` from Python 3.10 onwards (#11270)

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

2 files changed, 8 insertions, 6 deletions

diff --git a/sphinx/registry.py b/sphinx/registry.py
index d619de407..a3134bd2a 100644
--- a/sphinx/registry.py
+++ b/sphinx/registry.py
@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import sys
 import traceback
 import warnings
 from importlib import import_module
@@ -15,10 +16,10 @@ from docutils.parsers import Parser
 from docutils.parsers.rst import Directive
 from docutils.transforms import Transform
 
-try:  # Python < 3.10 (backport)
-    from importlib_metadata import entry_points
-except ImportError:
+if sys.version_info >= (3, 10):
     from importlib.metadata import entry_points
+else:
+    from importlib_metadata import entry_points
 
 from sphinx.builders import Builder
 from sphinx.config import Config
diff --git a/sphinx/theming.py b/sphinx/theming.py
index 173a9f5d9..772b568c2 100644
--- a/sphinx/theming.py
+++ b/sphinx/theming.py
@@ -5,15 +5,16 @@ from __future__ import annotations
 import configparser
 import os
 import shutil
+import sys
 import tempfile
 from os import path
 from typing import TYPE_CHECKING, Any
 from zipfile import ZipFile
 
-try:  # Python < 3.10 (backport)
-    from importlib_metadata import entry_points
-except ImportError:
+if sys.version_info >= (3, 10):
     from importlib.metadata import entry_points
+else:
+    from importlib_metadata import entry_points
 
 from sphinx import package_dir
 from sphinx.errors import ThemeError