Mercurial > libervia-backend

changeset 1812:160b0d4c6520

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
plugin XEP-0071, XEP-0277: method clean_xhtml has been renamed to cleanXHTML
author souliane <souliane@mailoo.org>
date Tue, 19 Jan 2016 11:51:07 +0100
parents 90ae9a2462c2
children cf53e3cc702a
files src/plugins/plugin_xep_0071.py src/plugins/plugin_xep_0277.py src/test/test_plugin_misc_text_syntaxes.py
diffstat 3 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/plugins/plugin_xep_0071.py	Tue Jan 19 11:49:25 2016 +0100
+++ b/src/plugins/plugin_xep_0071.py	Tue Jan 19 11:51:07 2016 +0100
@@ -118,7 +118,7 @@
             if xhtml:
                 raise exceptions.DataError(_("Can't have xhtml and rich content at the same time"))
         if xhtml:
-            d = self.synt_plg.clean_xhtml(xhtml)
+            d = self.synt_plg.cleanXHTML(xhtml)
         d.addCallback(syntax_converted)
         return d
 
--- a/src/plugins/plugin_xep_0277.py	Tue Jan 19 11:49:25 2016 +0100
+++ b/src/plugins/plugin_xep_0277.py	Tue Jan 19 11:51:07 2016 +0100
@@ -177,7 +177,7 @@
                     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()
-                microblog_data[key] = yield self.host.plugins["TEXT-SYNTAXES"].clean_xhtml(data)
+                microblog_data[key] = yield self.host.plugins["TEXT-SYNTAXES"].cleanXHTML(data)
             else:
                 key = check_conflict(elem.name)
                 microblog_data[key] = unicode(elem)
@@ -365,7 +365,7 @@
                             if '{}_xhtml'.format(elem_name) in data:
                                 raise failure.Failure(exceptions.DataError(_("Can't have xhtml and rich content at the same time")))
                         else:  # clean the XHTML input
-                            converted = yield synt.clean_xhtml(data[attr])
+                            converted = yield synt.cleanXHTML(data[attr])
 
                         xml_content = u'<div xmlns="{ns}">{converted}</div>'.format(
                                         ns=NS_XHTML,
--- a/src/test/test_plugin_misc_text_syntaxes.py	Tue Jan 19 11:49:25 2016 +0100
+++ b/src/test/test_plugin_misc_text_syntaxes.py	Tue Jan 19 11:51:07 2016 +0100
@@ -76,14 +76,14 @@
     </img></body>
    </div>"""
 
-        d = self.text_syntaxes.clean_xhtml(self.EVIL_HTML1)
+        d = self.text_syntaxes.cleanXHTML(self.EVIL_HTML1)
         d.addCallback(self.assertEqualXML, expected, ignore_blank=True)
         return d
 
     def test_styles_sanitise(self):
         expected = u"""<p style="color: blue">test <strong>retest</strong><br/><span style="color: #cf2828; font-size: 3px; color: red; color: red !important; font-size: 100px       !important; font-size: 100%; font-size: 100px; font-size: 100; font-size: 100 %; color: rgba(0, 0, 0, 0.1); color: rgb(35,79,255); background-color: no-repeat"> toto </span></p>"""
 
-        d = self.text_syntaxes.clean_xhtml(self.EVIL_HTML2)
+        d = self.text_syntaxes.cleanXHTML(self.EVIL_HTML2)
         d.addCallback(self.assertEqualXML, expected)
         return d