IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>
This commit is contained in:
panhongtao
2023-04-07 06:06:01 +08:00
committed by GitHub
parent aba392d87f
commit b2349254fc
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sphinx/registry.py
View File

@@ -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

7
sphinx/theming.py
View File

@@ -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