diff options
| author |   Raymond Hettinger <python@rcn.com> | 2016-09-11 23:23:24 -0700 |
|---|---|---|
| committer | Raymond Hettinger <python@rcn.com> | 2016-09-11 23:23:24 -0700 |
| commit | 11fa3ffcb11caf628435670b213f9bc2e3ba4f67 (patch) | |
| tree | a147fd06c6803f5ea86d4c419a99183ea3bdd14c /Lib/xml | |
| parent | Merge 3.5 - Issue #15308: Add 'interrupt execution' (^C) to Shell menu. (diff) | |
| parent | Issue #17582: xml.etree.ElementTree nows preserves whitespaces in attributes (diff) | |
| download | cpython-11fa3ffcb11caf628435670b213f9bc2e3ba4f67.tar.gz cpython-11fa3ffcb11caf628435670b213f9bc2e3ba4f67.tar.bz2 cpython-11fa3ffcb11caf628435670b213f9bc2e3ba4f67.zip | |
merge
Diffstat (limited to 'Lib/xml')
| -rw-r--r-- | Lib/xml/etree/ElementTree.py | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/Lib/xml/etree/ElementTree.py b/Lib/xml/etree/ElementTree.py index 4b0c661e317..735405681ff 100644 --- a/Lib/xml/etree/ElementTree.py +++ b/Lib/xml/etree/ElementTree.py @@ -1084,8 +1084,19 @@ def _escape_attrib(text): text = text.replace(">", ">") if "\"" in text: text = text.replace("\"", """) + # The following business with carriage returns is to satisfy + # Section 2.11 of the XML specification, stating that + # CR or CR LN should be replaced with just LN + # http://www.w3.org/TR/REC-xml/#sec-line-ends + if "\r\n" in text: + text = text.replace("\r\n", "\n") + if "\r" in text: + text = text.replace("\r", "\n") + #The following four lines are issue 17582 if "\n" in text: text = text.replace("\n", " ") + if "\t" in text: + text = text.replace("\t", "	") return text except (TypeError, AttributeError): _raise_serialization_error(text) |