pep/slixmpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

escape: use xml.etree.ElementTree._escape_attrib to avoid duplication

Browse source
This commit is contained in:
Jean-Philippe Caruana 2013-07-31 11:01:34 +02:00
parent 1c3bfd949b
commit b6e53c7b1b
1 changed files with 5 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
sleekxmpp/xmlstream/tostring.py
View file

@ -16,7 +16,7 @@
from __future__ import unicode_literals
import sys
from xml.etree.ElementTree import _escape_cdata, _raise_serialization_error
from xml.etree.ElementTree import _escape_cdata, _escape_attrib
if sys.version_info < (3, 0):
import types
@ -146,20 +146,7 @@ def escape(text, use_cdata=False):
if use_cdata:
return _escape_cdata(text, encoding)
# copied from xml.etree.ElementTree._escape_attrib with "&apos;" case
try:
if "&" in text:
text = text.replace("&", "&amp;")
if "<" in text:
text = text.replace("<", "&lt;")
if ">" in text:
text = text.replace(">", "&gt;")
if "\"" in text:
text = text.replace("\"", "&quot;")
if "'" in text:
text = text.replace("'", "&apos;")
if "\n" in text:
text = text.replace("\n", "&#10;")
return text.encode(encoding, "xmlcharrefreplace")
except (TypeError, AttributeError):
_raise_serialization_error(text)
text = _escape_attrib(text, encoding)
if "'" in text:
text = text.replace("'", "&apos;")
return text