summaryrefslogtreecommitdiff
path: root/sleekxmpp/xmlstream/tostring/tostring26.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-01-27 18:05:05 -0500
committerLance Stout <lancestout@gmail.com>2011-01-27 18:05:05 -0500
commitbd9bf3f1c7c17606f455ce0cf9c4d0b6b237a7fe (patch)
tree944aeaa34849e7fb6d822e9d3ff98b6db3a65546 /sleekxmpp/xmlstream/tostring/tostring26.py
parentcd800d636aa683dc562047bc517be7d1a9bb25c2 (diff)
downloadslixmpp-bd9bf3f1c7c17606f455ce0cf9c4d0b6b237a7fe.tar.gz
slixmpp-bd9bf3f1c7c17606f455ce0cf9c4d0b6b237a7fe.tar.bz2
slixmpp-bd9bf3f1c7c17606f455ce0cf9c4d0b6b237a7fe.tar.xz
slixmpp-bd9bf3f1c7c17606f455ce0cf9c4d0b6b237a7fe.zip
Update tostring methods.
Will now always show top-level namespace, unless it is the same as the stream's default namespace. Also added the XMPP stream namespace to the namespace map as 'stream'.
Diffstat (limited to 'sleekxmpp/xmlstream/tostring/tostring26.py')
-rw-r--r--sleekxmpp/xmlstream/tostring/tostring26.py22
1 files changed, 16 insertions, 6 deletions
diff --git a/sleekxmpp/xmlstream/tostring/tostring26.py b/sleekxmpp/xmlstream/tostring/tostring26.py
index 11501780..3d1ca3d7 100644
--- a/sleekxmpp/xmlstream/tostring/tostring26.py
+++ b/sleekxmpp/xmlstream/tostring/tostring26.py
@@ -10,7 +10,8 @@ from __future__ import unicode_literals
import types
-def tostring(xml=None, xmlns='', stanza_ns='', stream=None, outbuffer=''):
+def tostring(xml=None, xmlns='', stanza_ns='', stream=None,
+ outbuffer='', top_level=False):
"""
Serialize an XML object to a Unicode string.
@@ -29,6 +30,8 @@ def tostring(xml=None, xmlns='', stanza_ns='', stream=None, outbuffer=''):
stream -- The XML stream that generated the XML object.
outbuffer -- Optional buffer for storing serializations during
recursive calls.
+ top_level -- Indicates that the element is the outermost
+ element.
"""
# Add previous results to the start of the output.
output = [outbuffer]
@@ -42,14 +45,21 @@ def tostring(xml=None, xmlns='', stanza_ns='', stream=None, outbuffer=''):
else:
tag_xmlns = u''
+ default_ns = ''
+ stream_ns = ''
+ if stream:
+ default_ns = stream.default_ns
+ stream_ns = stream.stream_ns
+
# Output the tag name and derived namespace of the element.
namespace = u''
- if tag_xmlns not in ['', xmlns, stanza_ns]:
+ if top_level and tag_xmlns not in ['', default_ns, stream_ns] or \
+ tag_xmlns not in ['', xmlns, stanza_ns, stream_ns]:
namespace = u' xmlns="%s"' % tag_xmlns
- if stream and tag_xmlns in stream.namespace_map:
- mapped_namespace = stream.namespace_map[tag_xmlns]
- if mapped_namespace:
- tag_name = u"%s:%s" % (mapped_namespace, tag_name)
+ if stream and tag_xmlns in stream.namespace_map:
+ mapped_namespace = stream.namespace_map[tag_xmlns]
+ if mapped_namespace:
+ tag_name = u"%s:%s" % (mapped_namespace, tag_name)
output.append(u"<%s" % tag_name)
output.append(namespace)