[REVERT] 4394, because Thu is stupid

bzr revid: nicolas.vanhoren@openerp.com-20120905145703-7t8uiyqur0l16n2b

diff --git a/openerp/tests/__init__.py b/openerp/tests/__init__.py
index d3ab62e..2f7f662 100644 (file)
--- a/openerp/tests/__init__.py
+++ b/openerp/tests/__init__.py
@@ -8,7 +8,7 @@ Tests can be explicitely added to the `fast_suite` or `checks` lists or not.
 See the :ref:`test-framework` section in the :ref:`features` list.
 """
 
-from . import test_expression, test_html_sanitize, test_ir_sequence, test_orm,\
+from . import test_expression, test_ir_sequence, test_orm,\
               test_view_validation, test_uninstall
 
 fast_suite = [
@@ -17,7 +17,6 @@ fast_suite = [
 
 checks = [
     test_expression,
-    test_html_sanitize,
     test_orm,
     test_view_validation,
 ]

diff --git a/openerp/tools/html_sanitize.py b/openerp/tools/html_sanitize.py
index 6763b46..5164ceb 100644 (file)
--- a/openerp/tools/html_sanitize.py
+++ b/openerp/tools/html_sanitize.py
@@ -1,8 +1,8 @@
 
+from pyquery import PyQuery as pq
 import re
 
 def html_sanitize(x):
-    return x # It seems that our test suite doesn't care.
     if not x:
         return x
     root = pq("<div />")
@@ -59,4 +59,4 @@ def append_to(new_ones, el):
             else:
                 children[-1].tail = i
         else:
-            el.append(i)
+            el.append(i)
\ No newline at end of file

diff --git a/setup.py b/setup.py
index a26b74e..a033921 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -99,6 +99,7 @@ setuptools.setup(
           'mako',
           'psycopg2',
           'pydot',
+          'pyquery',
           'python-dateutil < 2',
           'python-ldap',
           'python-openid',