+
![]()
diff --git a/openerp/addons/base/rng/view.rng b/openerp/addons/base/rng/view.rng
index 0d6527e5972..dfeeb03d98b 100644
--- a/openerp/addons/base/rng/view.rng
+++ b/openerp/addons/base/rng/view.rng
@@ -172,6 +172,9 @@
-
@@ -223,6 +227,8 @@
5years
+
yop
xxx' + self.assertEqual(x, html_sanitize(x)) - def test_test_case(self): + def test_no_exception(self): html_sanitize(test_case) - def test_crm(self): + def test_unicode(self): html_sanitize("Merci à l'intérêt pour notre produit.nous vous contacterons bientôt. Merci") if __name__ == '__main__': diff --git a/openerp/tools/amount_to_text_en.py b/openerp/tools/amount_to_text_en.py index 9a1ac939e6b..97d690c70e2 100644 --- a/openerp/tools/amount_to_text_en.py +++ b/openerp/tools/amount_to_text_en.py @@ -88,8 +88,8 @@ def amount_to_text(number, currency): end_word = english_number(int(list[1])) cents_number = int(list[1]) cents_name = (cents_number > 1) and 'Cents' or 'Cent' - final_result = start_word +' '+units_name+' and ' + end_word +' '+cents_name - return final_result + + return ' '.join(filter(None, [start_word, units_name, (start_word or units_name) and (end_word or cents_name) and 'and', end_word, cents_name])) #------------------------------------------------------------- diff --git a/openerp/tools/html_sanitize.py b/openerp/tools/html_sanitize.py index 6763b464ab1..65f17be074f 100644 --- a/openerp/tools/html_sanitize.py +++ b/openerp/tools/html_sanitize.py @@ -1,17 +1,22 @@ +import lxml.html import re def html_sanitize(x): - return x # It seems that our test suite doesn't care. if not x: return x - root = pq("") if type(x) == str: x = unicode(x, "utf8", "replace") - root.html(x) - result = handle_element(root[0]) - new = pq(result) - return new.html() + root = lxml.html.fromstring("%s
" % x)
+ result = handle_element(root)
+ res = ""
+ for el in children(result[0]):
+ if type(el) == str or type(el) == unicode:
+ res += el
+ else:
+ el.tail = ""
+ res += lxml.html.tostring(el)
+ return res
to_remove = set(["script", "head", "meta", "title", "link", "img"])
to_unwrap = set(["html", "body"])
@@ -33,7 +38,7 @@ def handle_element(el):
return []
if el.tag in to_unwrap:
return reduce(lambda x,y: x+y, [handle_element(x) for x in children(el)])
- new = pq("<%s />" % el.tag)[0]
+ new = lxml.html.fromstring("<%s />" % el.tag)
for i in children(el):
append_to(handle_element(i), new)
if el.tag in special:
diff --git a/scripts/run_all_with_tests.sh b/scripts/run_all_with_tests.sh
index 4103b6243e2..877a5908b1a 100755
--- a/scripts/run_all_with_tests.sh
+++ b/scripts/run_all_with_tests.sh
@@ -1,7 +1,7 @@
DATABASE=trunk
dropdb ${DATABASE}
REPOSITORIES=../../addons/trunk
-MODULES=`python -c "import os; print ','.join(os.listdir('${REPOSITORIES}'))"`
+MODULES=`python -c "import os; print ','.join(list(set(os.listdir('${REPOSITORIES}')) - set(['document_ftp'])))"`
createdb ${DATABASE}
rm openerp-server.log
./openerp-server \