[Python-checkins] bpo-33187: Document 3.9 changes to xml.etree.ElementInclude.include (GH-20438)
Shantanu
webhook-mailer at python.org
Mon Jun 8 10:11:53 EDT 2020
https://github.com/python/cpython/commit/301f0d4ff9b6bd60599eea0612904f65a92e6dd9
commit: 301f0d4ff9b6bd60599eea0612904f65a92e6dd9
branch: master
author: Shantanu <hauntsaninja at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2020-06-08T16:11:44+02:00
summary:
bpo-33187: Document 3.9 changes to xml.etree.ElementInclude.include (GH-20438)
Looks like the merging of bpo-33187 and bpo-20928 was racy, resulting in
this change going undocumented.
files:
M Doc/library/xml.etree.elementtree.rst
diff --git a/Doc/library/xml.etree.elementtree.rst b/Doc/library/xml.etree.elementtree.rst
index 658bc3a54f86e..2085a85927e46 100644
--- a/Doc/library/xml.etree.elementtree.rst
+++ b/Doc/library/xml.etree.elementtree.rst
@@ -816,16 +816,25 @@ Functions
loader fails, it can return None or raise an exception.
-.. function:: xml.etree.ElementInclude.include( elem, loader=None)
+.. function:: xml.etree.ElementInclude.include( elem, loader=None, base_url=None, \
+ max_depth=6)
This function expands XInclude directives. *elem* is the root element. *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`. Returns the expanded resource. If the parse mode is
+ :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.
+
+ 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.
+ .. versionadded:: 3.9
+ The *base_url* and *max_depth* parameters.
+
.. _elementtree-element-objects:
More information about the Python-checkins
mailing list