summaryrefslogtreecommitdiffstats
path: root/Lib/xml/etree/ElementInclude.py
diff options
context:
space:
mode:
authorFlorent Xicluna <florent.xicluna@gmail.com>2010-08-09 20:46:49 (GMT)
committerFlorent Xicluna <florent.xicluna@gmail.com>2010-08-09 20:46:49 (GMT)
commit2f1b1ffb1d4bb73f6269e95d50cea04eb206d417 (patch)
tree462992ed1c3eb5645a9948f3511efff0aa659830 /Lib/xml/etree/ElementInclude.py
parent0fad1c2272ed68d877c89b10da5265cf403cf189 (diff)
downloadcpython-2f1b1ffb1d4bb73f6269e95d50cea04eb206d417.zip
cpython-2f1b1ffb1d4bb73f6269e95d50cea04eb206d417.tar.gz
cpython-2f1b1ffb1d4bb73f6269e95d50cea04eb206d417.tar.bz2
Merged revisions 83864 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r83864 | florent.xicluna | 2010-08-09 01:08:41 +0200 (lun., 09 août 2010) | 2 lines Fix xml.etree.ElementInclude to include the tail of the current node. Issue #6231 ........
Diffstat (limited to 'Lib/xml/etree/ElementInclude.py')
-rw-r--r--Lib/xml/etree/ElementInclude.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/xml/etree/ElementInclude.py b/Lib/xml/etree/ElementInclude.py
index dde0a41..84fd754 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]