diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py
index ad3f112f8a8..98ca4d28809 100644
--- a/Lib/test/test_xml_etree.py
+++ b/Lib/test/test_xml_etree.py
@@ -1259,6 +1259,14 @@ def processinginstruction():
XINCLUDE["count.txt"] = "324387"
+XINCLUDE["C2b.xml"] = """\
+
+
+ This document has been accessed
+ times.
+
+"""
+
XINCLUDE["C3.xml"] = """\
@@ -1334,6 +1342,16 @@ def xinclude():
324387 times.
+ Textual inclusion after sibling element (based on modified XInclude C.2)
+
+ >>> document = xinclude_loader("C2b.xml")
+ >>> ElementInclude.include(document, xinclude_loader)
+ >>> print(serialize(document)) # C2b
+
+ This document has been accessed
+ 324387 times.
+
+
Textual inclusion of XML example (XInclude C.3)
>>> document = xinclude_loader("C3.xml")
diff --git a/Lib/xml/etree/ElementInclude.py b/Lib/xml/etree/ElementInclude.py
index dde0a41531c..84fd7548b28 100644
--- a/Lib/xml/etree/ElementInclude.py
+++ b/Lib/xml/etree/ElementInclude.py
@@ -125,7 +125,7 @@ def include(elem, loader=None):
)
if i:
node = elem[i-1]
- node.tail = (node.tail or "") + text
+ node.tail = (node.tail or "") + text + (e.tail or "")
else:
elem.text = (elem.text or "") + text + (e.tail or "")
del elem[i]
diff --git a/Misc/NEWS b/Misc/NEWS
index bf86216def7..0f54b9317a8 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -29,6 +29,9 @@ Core and Builtins
Library
-------
+- Issue #6231: Fix xml.etree.ElementInclude to include the tail of the
+ current node.
+
- Issue #6869: Fix a refcount problem in the _ctypes extension.
- Issue5504 - ctypes should now work with systems where mmap can't be