summaryrefslogtreecommitdiff
path: root/sleekxmpp/xmlstream
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2013-09-12 10:21:56 -0700
committerLance Stout <lancestout@gmail.com>2013-09-12 10:21:56 -0700
commit23750357e21ce1e22445b2e702bdd4efb77f2369 (patch)
treeba05ae132a04380603c9b4417ec7cd913549f56f /sleekxmpp/xmlstream
parent07284f380fa0a893a5ef56774fcef71a47851668 (diff)
parentb6e53c7b1be3691514cbf25e3de09d6742a4a587 (diff)
downloadslixmpp-23750357e21ce1e22445b2e702bdd4efb77f2369.tar.gz
slixmpp-23750357e21ce1e22445b2e702bdd4efb77f2369.tar.bz2
slixmpp-23750357e21ce1e22445b2e702bdd4efb77f2369.tar.xz
slixmpp-23750357e21ce1e22445b2e702bdd4efb77f2369.zip
Merge pull request #254 from barreverte/develop
tostring.escape : optimization
Diffstat (limited to 'sleekxmpp/xmlstream')
-rw-r--r--sleekxmpp/xmlstream/tostring.py38
1 files changed, 9 insertions, 29 deletions
diff --git a/sleekxmpp/xmlstream/tostring.py b/sleekxmpp/xmlstream/tostring.py
index c49abd3e..4d7976b1 100644
--- a/sleekxmpp/xmlstream/tostring.py
+++ b/sleekxmpp/xmlstream/tostring.py
@@ -16,6 +16,7 @@
from __future__ import unicode_literals
import sys
+from xml.etree.ElementTree import _escape_cdata, _escape_attrib
if sys.version_info < (3, 0):
import types
@@ -140,33 +141,12 @@ def tostring(xml=None, xmlns='', stream=None, outbuffer='',
def escape(text, use_cdata=False):
- """Convert special characters in XML to escape sequences.
+ encoding = 'utf-8'
- :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 = {'&': '&amp;',
- '<': '&lt;',
- '>': '&gt;',
- "'": '&apos;',
- '"': '&quot;'}
-
- 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
+ if use_cdata:
+ return _escape_cdata(text, encoding)
+
+ text = _escape_attrib(text, encoding)
+ if "'" in text:
+ text = text.replace("'", "&apos;")
+ return text