Merge branch 'stream_features' into develop

3 files changed, 37 insertions, 14 deletions

diff --git a/sleekxmpp/xmlstream/stanzabase.py b/sleekxmpp/xmlstream/stanzabase.py
index d9a4636a..f1a9e1f5 100644
--- a/sleekxmpp/xmlstream/stanzabase.py
+++ b/sleekxmpp/xmlstream/stanzabase.py
@@ -1064,7 +1064,9 @@ class ElementBase(object):
                             Defaults to True.
         """
         stanza_ns = '' if top_level_ns else self.namespace
-        return tostring(self.xml, xmlns='', stanza_ns=stanza_ns)
+        return tostring(self.xml, xmlns='',
+                        stanza_ns=stanza_ns,
+                        top_level = not top_level_ns)
 
     def __repr__(self):
         """
@@ -1282,7 +1284,8 @@ class StanzaBase(ElementBase):
         stanza_ns = '' if top_level_ns else self.namespace
         return tostring(self.xml, xmlns='',
                         stanza_ns=stanza_ns,
-                        stream=self.stream)
+                        stream=self.stream,
+                        top_level = not top_level_ns)
 
 
 # To comply with PEP8, method names now use underscores.
diff --git a/sleekxmpp/xmlstream/tostring/tostring.py b/sleekxmpp/xmlstream/tostring/tostring.py
index 38b08d82..a6bb6ebc 100644
--- a/sleekxmpp/xmlstream/tostring/tostring.py
+++ b/sleekxmpp/xmlstream/tostring/tostring.py
@@ -7,7 +7,8 @@
 """
 
 
-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.
 
@@ -26,6 +27,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]
@@ -39,14 +42,21 @@ def tostring(xml=None, xmlns='', stanza_ns='', stream=None, outbuffer=''):
     else:
         tag_xmlns = ''
 
+    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 = ''
-    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 = ' 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 = "%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 = "%s:%s" % (mapped_namespace, tag_name)
     output.append("<%s" % tag_name)
     output.append(namespace)
 
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)