commit: 5c166770c34a10248ebcc5a7304669b0a4004ca6 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Wed Aug 28 07:19:47 2024 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> CommitDate: Wed Aug 28 07:55:40 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c166770
dev-python/sphinx: remove unused patch Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> .../sphinx/files/sphinx-7.3.7-opt-defusedxml.patch | 34 ---------------------- 1 file changed, 34 deletions(-) diff --git a/dev-python/sphinx/files/sphinx-7.3.7-opt-defusedxml.patch b/dev-python/sphinx/files/sphinx-7.3.7-opt-defusedxml.patch deleted file mode 100644 index cb70e2cf89fc..000000000000 --- a/dev-python/sphinx/files/sphinx-7.3.7-opt-defusedxml.patch +++ /dev/null @@ -1,34 +0,0 @@ -From ce86026f3b667949ef39f7fdab9a40941d99c5ca Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <[email protected]> -Date: Sat, 11 May 2024 18:31:02 +0200 -Subject: [PATCH] DEPS: Lazy import `defusedxml` only when necessary (#12362) - -The `defusedxml` dependency was added to `sphinx.testing` in sphinx 7.3, -but it is not part of the core sphinx dependencies, and not strictly necessary for the running of the pytest plugin. -This commit moves the import into the only function which uses it, -so that the pytest plugins can be used again without this dependency. ---- - sphinx/testing/util.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/sphinx/testing/util.py b/sphinx/testing/util.py -index d1de8ea2b7..b2df709eea 100644 ---- a/sphinx/testing/util.py -+++ b/sphinx/testing/util.py -@@ -11,7 +11,6 @@ - from types import MappingProxyType - from typing import TYPE_CHECKING - --from defusedxml.ElementTree import parse as xml_parse - from docutils import nodes - from docutils.parsers.rst import directives, roles - -@@ -73,6 +72,8 @@ def assert_node(node: Node, cls: Any = None, xpath: str = "", **kwargs: Any) -> - # keep this to restrict the API usage and to have a correct return type - def etree_parse(path: str | os.PathLike[str]) -> ElementTree: - """Parse a file into a (safe) XML element tree.""" -+ from defusedxml.ElementTree import parse as xml_parse -+ - return xml_parse(path) - -
