# HG changeset patch # User Sylvain Thénault # Date 1294155306 -3600 # Node ID bba36f16891931285c41b1f16537bb3eb1abf116 # Parent 68bb0943d1925f622009cfbe3d8b87fe9ae90d2c# Parent b75f688bded732062da422e0f941d307c13b5462 merge stable heads diff -r b75f688bded7 -r bba36f168919 devtools/htmlparser.py --- a/devtools/htmlparser.py Tue Jan 04 16:33:13 2011 +0100 +++ b/devtools/htmlparser.py Tue Jan 04 16:35:06 2011 +0100 @@ -15,16 +15,17 @@ # # You should have received a copy of the GNU Lesser General Public License along # with CubicWeb. If not, see . -"""defines a validating HTML parser used in web application tests - -""" +"""defines a validating HTML parser used in web application tests""" import re import sys from lxml import etree +from logilab.common.deprecation import class_deprecated + from cubicweb.view import STRICT_DOCTYPE, TRANSITIONAL_DOCTYPE + STRICT_DOCTYPE = str(STRICT_DOCTYPE) TRANSITIONAL_DOCTYPE = str(TRANSITIONAL_DOCTYPE) @@ -51,10 +52,7 @@ def __init__(self): Validator.__init__(self) # XXX understand what's happening under windows - validate = True - if sys.platform == 'win32': - validate = False - self.parser = etree.XMLParser(dtd_validation=validate) + self.parser = etree.XMLParser(dtd_validation=sys.platform != 'win32') def preprocess_data(self, data): """used to fix potential blockquote mess generated by docutils""" @@ -87,12 +85,14 @@ Validator.__init__(self) self.parser = etree.XMLParser() + class XMLDemotingValidator(SaxOnlyValidator): """ some views produce html instead of xhtml, using demote_to_html this is typically related to the use of external dependencies which do not produce valid xhtml (google maps, ...) """ + __metaclass__ = class_deprecated def preprocess_data(self, data): if data.startswith(' used in progress widget, unknown in html dtd diff -r b75f688bded7 -r bba36f168919 view.py --- a/view.py Tue Jan 04 16:33:13 2011 +0100 +++ b/view.py Tue Jan 04 16:35:06 2011 +0100 @@ -40,11 +40,6 @@ NOINDEX = u'' NOFOLLOW = u'' - -CW_XMLNS = '''[ - - ] -''' CW_XHTML_EXTENSIONS = '''[ @@ -86,9 +81,9 @@ "> ] ''' TRANSITIONAL_DOCTYPE = u'\n' % CW_XHTML_EXTENSIONS -TRANSITIONAL_DOCTYPE_NOEXT = u'\n' % CW_XMLNS +TRANSITIONAL_DOCTYPE_NOEXT = u'\n' STRICT_DOCTYPE = u'\n' % CW_XHTML_EXTENSIONS -STRICT_DOCTYPE_NOEXT = u'\n' % CW_XMLNS +STRICT_DOCTYPE_NOEXT = u'\n' # base view object ############################################################