From: Raymond Hettinger <python@rcn.com>
Date: Mon, 12 Sep 2016 06:23:24 +0000 (-0700)
Subject: merge
X-Git-Tag: v3.6.0b1~17^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=11fa3ffcb11caf628435670b213f9bc2e3ba4f67;p=python

merge
---

11fa3ffcb11caf628435670b213f9bc2e3ba4f67
diff --cc Lib/xml/etree/ElementTree.py
index 4b0c661e31,92821c5706..735405681f
--- a/Lib/xml/etree/ElementTree.py
+++ b/Lib/xml/etree/ElementTree.py
@@@ -1084,8 -1083,19 +1084,19 @@@ def _escape_attrib(text)
              text = text.replace(">", "&gt;")
          if "\"" in text:
              text = text.replace("\"", "&quot;")
+         # The following business with carriage returns is to satisfy
 -        # Section 2.11 of the XML specification, stating that 
++        # 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", "&#10;")
+         if "\t" in text:
+             text = text.replace("\t", "&#09;")
          return text
      except (TypeError, AttributeError):
          _raise_serialization_error(text)
diff --cc Misc/NEWS
index e6f03849ab,1dc5ad898c..b58822e24a
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -202,13 -81,11 +202,16 @@@ Librar
  - Issue #14977: mailcap now respects the order of the lines in the mailcap
    files ("first match"), as required by RFC 1542.  Patch by Michael Lazar.
  
 +- Issue #28025: Convert all ssl module constants to IntEnum and IntFlags.
 +  SSLContext properties now return flags and enums.
 +
 +- Issue #433028: Added support of modifier spans in regular expressions.
 +
  - Issue #24594: Validates persist parameter when opening MSI database
  
+ - Issue #17582: xml.etree.ElementTree nows preserves whitespaces in attributes
+   (Patch by Duane Griffin.  Reviewed and approved by Stefan Behnel.)
+ 
  - Issue #28047: Fixed calculation of line length used for the base64 CTE
    in the new email policies.