# HG changeset patch
# User Goffi <goffi@goffi.org>
# Date 1453490657 -3600
# Node ID aaf034bc6f7a674659c89f67b12a9c4fd6d29aaa
# Parent  d6062afdd54f05a8bcad454dc2a148110c08d30b
plugin XEP-0277: moved NS_XHTML namespace to constants + adapted parsing to new behaviour of ElementParser

diff -r d6062afdd54f -r aaf034bc6f7a src/core/constants.py
--- a/src/core/constants.py	Fri Jan 22 20:24:17 2016 +0100
+++ b/src/core/constants.py	Fri Jan 22 20:24:17 2016 +0100
@@ -116,6 +116,7 @@
     NS_CLIENT = 'jabber:client'
     NS_FORWARD = 'urn:xmpp:forward:0'
     NS_DELAY = 'urn:xmpp:delay'
+    NS_XHTML = 'http://www.w3.org/1999/xhtml'
 
 
     ## Configuration ##
diff -r d6062afdd54f -r aaf034bc6f7a src/plugins/plugin_xep_0277.py
--- a/src/plugins/plugin_xep_0277.py	Fri Jan 22 20:24:17 2016 +0100
+++ b/src/plugins/plugin_xep_0277.py	Fri Jan 22 20:24:17 2016 +0100
@@ -43,7 +43,6 @@
 
 NS_MICROBLOG = 'urn:xmpp:microblog:0'
 NS_ATOM = 'http://www.w3.org/2005/Atom'
-NS_XHTML = 'http://www.w3.org/1999/xhtml'
 NS_PUBSUB_EVENT = "{}{}".format(pubsub.NS_PUBSUB, "#event")
 NS_COMMENT_PREFIX = '{}:comments/'.format(NS_MICROBLOG)
 
@@ -173,7 +172,7 @@
                 data_elt = elem.firstChildElement()
                 if data_elt is None:
                     raise failure.Failure(exceptions.DataError(u"XHML content not wrapped in a <div/> element, this is not standard !"))
-                if data_elt.uri != NS_XHTML:
+                if data_elt.uri != C.NS_XHTML:
                     raise failure.Failure(exceptions.DataError(_('Content of type XHTML must declare its namespace!')))
                 key = check_conflict(u'{}_xhtml'.format(elem.name))
                 data = data_elt.toXml()
@@ -367,10 +366,10 @@
                         else:
                             xml_content = data[attr]
 
-                        div_elt = xml_tools.ElementParser()(xml_content, namespace=NS_XHTML)
-                        if div_elt.name != 'div' or div_elt.uri != NS_XHTML or div_elt.attributes:
+                        div_elt = xml_tools.ElementParser()(xml_content, namespace=C.NS_XHTML)
+                        if div_elt.name != 'div' or div_elt.uri != C.NS_XHTML or div_elt.attributes:
                             # we need a wrapping <div/> at the top with XHTML namespace
-                            wrap_div_elt = domish.Element((NS_XHTML, 'div'))
+                            wrap_div_elt = domish.Element((C.NS_XHTML, 'div'))
                             wrap_div_elt.addChild(div_elt)
                             div_elt = wrap_div_elt
                         elem.addChild(div_elt)