jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update tostring to inject xmlns definitions when needed.

Browse Source
This commit is contained in:
Lance Stout 2013-01-24 02:43:46 -08:00
parent 4f9a95b011
commit 403b1802ec
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sleekxmpp/xmlstream/tostring.py
View File

@ -24,8 +24,8 @@ if sys.version_info < (3, 0):
XML_NS = 'http://www.w3.org/XML/1998/namespace' XML_NS = 'http://www.w3.org/XML/1998/namespace'
def tostring(xml=None, xmlns='', stream=None, def tostring(xml=None, xmlns='', stream=None, outbuffer='',
outbuffer='', top_level=False, open_only=False): top_level=False, open_only=False, namespaces=None):
"""Serialize an XML object to a Unicode string. """Serialize an XML object to a Unicode string.
If an outer xmlns is provided using ``xmlns``, then the current element's If an outer xmlns is provided using ``xmlns``, then the current element's
@ -41,7 +41,8 @@ def tostring(xml=None, xmlns='', stream=None,
during recursive calls. during recursive calls.
:param bool top_level: Indicates that the element is the outermost :param bool top_level: Indicates that the element is the outermost
element. element.
:param set namespaces: Track which namespaces are in active use so
that new ones can be declared when needed.
:type xml: :py:class:`~xml.etree.ElementTree.Element` :type xml: :py:class:`~xml.etree.ElementTree.Element`
:type stream: :class:`~sleekxmpp.xmlstream.xmlstream.XMLStream` :type stream: :class:`~sleekxmpp.xmlstream.xmlstream.XMLStream`
@ -63,6 +64,7 @@ def tostring(xml=None, xmlns='', stream=None,
default_ns = '' default_ns = ''
stream_ns = '' stream_ns = ''
use_cdata = False use_cdata = False
if stream: if stream:
default_ns = stream.default_ns default_ns = stream.default_ns
stream_ns = stream.stream_ns stream_ns = stream.stream_ns
@ -82,6 +84,7 @@ def tostring(xml=None, xmlns='', stream=None,
output.append(namespace) output.append(namespace)
# Output escaped attribute values. # Output escaped attribute values.
new_namespaces = set()
for attrib, value in xml.attrib.items(): for attrib, value in xml.attrib.items():
value = escape(value, use_cdata) value = escape(value, use_cdata)
if '}' not in attrib: if '}' not in attrib:
@ -92,9 +95,15 @@ def tostring(xml=None, xmlns='', stream=None,
if stream and attrib_ns in stream.namespace_map: if stream and attrib_ns in stream.namespace_map:
mapped_ns = stream.namespace_map[attrib_ns] mapped_ns = stream.namespace_map[attrib_ns]
if mapped_ns: if mapped_ns:
output.append(' %s:%s="%s"' % (mapped_ns, if namespaces is None:
attrib, namespaces = set()
value)) if attrib_ns not in namespaces:
namespaces.add(attrib_ns)
new_namespaces.add(attrib_ns)
output.append(' xmlns:%s="%s"' % (
mapped_ns, attrib_ns))
output.append(' %s:%s="%s"' % (
mapped_ns, attrib, value))
elif attrib_ns == XML_NS: elif attrib_ns == XML_NS:
output.append(' xml:%s="%s"' % (attrib, value)) output.append(' xml:%s="%s"' % (attrib, value))
@ -110,7 +119,8 @@ def tostring(xml=None, xmlns='', stream=None,
output.append(escape(xml.text, use_cdata)) output.append(escape(xml.text, use_cdata))
if len(xml): if len(xml):
for child in xml: for child in xml:
output.append(tostring(child, tag_xmlns, stream)) output.append(tostring(child, tag_xmlns, stream,
namespaces=namespaces))
output.append("</%s>" % tag_name) output.append("</%s>" % tag_name)
elif xml.text: elif xml.text:
# If we only have text content. # If we only have text content.
@ -121,6 +131,11 @@ def tostring(xml=None, xmlns='', stream=None,
if xml.tail: if xml.tail:
# If there is additional text after the element. # If there is additional text after the element.
output.append(escape(xml.tail, use_cdata)) output.append(escape(xml.tail, use_cdata))
for ns in new_namespaces:
# Remove namespaces introduced in this context. This is necessary
# because the namespaces object continues to be shared with other
# contexts.
namespaces.remove(ns)
return ''.join(output) return ''.join(output)