Skip to content

gh-101549: fix documentation of xml.etree.ElementInclude #101550

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Apr 11, 2024
Merged
32 changes: 14 additions & 18 deletions Doc/library/xml.etree.elementtree.rst
Original file line number Diff line number Diff line change
Expand Up @@ -830,33 +830,29 @@ Functions

.. module:: xml.etree.ElementInclude

.. function:: xml.etree.ElementInclude.default_loader( href, parse, encoding=None)
:module:
.. function:: default_loader(href, parse, encoding=None)

Default loader. This default loader reads an included resource from disk. *href* is a URL.
*parse* is for parse mode either "xml" or "text". *encoding*
is an optional text encoding. If not given, encoding is ``utf-8``. Returns the
expanded resource. If the parse mode is ``"xml"``, this is an ElementTree
instance. If the parse mode is "text", this is a Unicode string. If the
loader fails, it can return None or raise an exception.
Default loader. This default loader reads an included resource from disk.
*href* is a URL. *parse* is for parse mode either "xml" or "text".
*encoding* is an optional text encoding. If not given, encoding is ``utf-8``.
Returns the expanded resource.
If the parse mode is ``"xml"``, this is an :class:`~xml.etree.ElementTree.Element` instance.
If the parse mode is ``"text"``, this is a string.
If the loader fails, it can return ``None`` or raise an exception.


.. function:: xml.etree.ElementInclude.include( elem, loader=None, base_url=None, \
max_depth=6)
:module:
.. function:: include(elem, loader=None, base_url=None, max_depth=6)

This function expands XInclude directives. *elem* is the root element. *loader* is
This function expands XInclude directives in-place in *elem*. *elem* is the
root element or an :class:`~xml.etree.ElementTree.ElementTree` instance. *loader* is
an optional resource loader. If omitted, it defaults to :func:`default_loader`.
If given, it should be a callable that implements the same interface as
:func:`default_loader`. *base_url* is base URL of the original file, to resolve
relative include file references. *max_depth* is the maximum number of recursive
inclusions. Limited to reduce the risk of malicious content explosion. Pass a
negative value to disable the limitation.
inclusions. Limited to reduce the risk of malicious content explosion.
Pass ``None`` to disable the limitation.

Returns the expanded resource. If the parse mode is
``"xml"``, this is an ElementTree instance. If the parse mode is "text",
this is a Unicode string. If the loader fails, it can return None or
raise an exception.
Returns ``None``. Updates tree pointed by *elem*.

.. versionadded:: 3.9
The *base_url* and *max_depth* parameters.
Expand Down
9 changes: 5 additions & 4 deletions Lib/xml/etree/ElementInclude.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ class LimitedRecursiveIncludeError(FatalIncludeError):
# @param parse Parse mode. Either "xml" or "text".
# @param encoding Optional text encoding (UTF-8 by default for "text").
# @return The expanded resource. If the parse mode is "xml", this
# is an ElementTree instance. If the parse mode is "text", this
# is a Unicode string. If the loader fails, it can return None
# is an Element instance. If the parse mode is "text", this
# is a string. If the loader fails, it can return None
# or raise an OSError exception.
# @throws OSError If the loader fails to load the resource.

Expand All @@ -106,12 +106,13 @@ def default_loader(href, parse, encoding=None):
# relative include file references.
# @param max_depth The maximum number of recursive inclusions.
# Limited to reduce the risk of malicious content explosion.
# Pass a negative value to disable the limitation.
# Pass None to disable the limitation.
# @throws LimitedRecursiveIncludeError If the {@link max_depth} was exceeded.
# @throws FatalIncludeError If the function fails to include a given
# resource, or if the tree contains malformed XInclude elements.
# @throws IOError If the function fails to load a given resource.
# @returns the node or its replacement if it was an XInclude node
# @throws ValueError If negative {@link max_depth} is passed.
# @returns None. Modifies tree pointed by {@link elem}

def include(elem, loader=None, base_url=None,
max_depth=DEFAULT_MAX_INCLUSION_DEPTH):
Expand Down