diff options
| -rw-r--r-- | sleekxmpp/xmlstream/tostring.py | 53 | ||||
| -rw-r--r-- | tests/test_tostring.py | 3 |
2 files changed, 24 insertions, 32 deletions
diff --git a/sleekxmpp/xmlstream/tostring.py b/sleekxmpp/xmlstream/tostring.py index c49abd3e..771f8dab 100644 --- a/sleekxmpp/xmlstream/tostring.py +++ b/sleekxmpp/xmlstream/tostring.py @@ -140,33 +140,26 @@ def tostring(xml=None, xmlns='', stream=None, outbuffer='', def escape(text, use_cdata=False): - """Convert special characters in XML to escape sequences. - - :param string text: The XML text to convert. - :rtype: Unicode string - """ - if sys.version_info < (3, 0): - if type(text) != types.UnicodeType: - text = unicode(text, 'utf-8', 'ignore') - - escapes = {'&': '&', - '<': '<', - '>': '>', - "'": ''', - '"': '"'} - - if not use_cdata: - text = list(text) - for i, c in enumerate(text): - text[i] = escapes.get(c, c) - return ''.join(text) - else: - escape_needed = False - for c in text: - if c in escapes: - escape_needed = True - break - if escape_needed: - escaped = map(lambda x : "<![CDATA[%s]]>" % x, text.split("]]>")) - return "<![CDATA[]]]><![CDATA[]>]]>".join(escaped) - return text + encoding = 'utf-8' + from xml.etree.ElementTree import _escape_cdata, _raise_serialization_error + + if use_cdata: + return _escape_cdata(text, encoding) + + # copied from xml.etree.ElementTree._escape_attrib with "'" case + try: + if "&" in text: + text = text.replace("&", "&") + if "<" in text: + text = text.replace("<", "<") + if ">" in text: + text = text.replace(">", ">") + if "\"" in text: + text = text.replace("\"", """) + if "'" in text: + text = text.replace("'", "'") + if "\n" in text: + text = text.replace("\n", " ") + return text.encode(encoding, "xmlcharrefreplace") + except (TypeError, AttributeError): + _raise_serialization_error(text) diff --git a/tests/test_tostring.py b/tests/test_tostring.py index e6148533..be11ab03 100644 --- a/tests/test_tostring.py +++ b/tests/test_tostring.py @@ -34,8 +34,7 @@ class TestToString(SleekTest): desired = """<foo bar="baz">'Hi""" desired += """ & welcome!'</foo>""" - self.failUnless(escaped == desired, - "XML escaping did not work: %s." % escaped) + self.assertEqual(escaped, desired) def testEmptyElement(self): """Test converting an empty element to a string.""" |