diff -r ae898a084da2 -r 7b26fe71404f view.py --- a/view.py Fri Apr 26 11:53:47 2013 +0200 +++ b/view.py Fri Apr 26 12:10:37 2013 +0200 @@ -42,50 +42,11 @@ NOINDEX = u'' NOFOLLOW = u'' -CW_XHTML_EXTENSIONS = '''[ - - -\n' +TRANSITIONAL_DOCTYPE = TRANSITIONAL_DOCTYPE_NOEXT # bw compat - cubicweb:accesskey CDATA #IMPLIED - cubicweb:actualrql CDATA #IMPLIED - cubicweb:dataurl CDATA #IMPLIED - cubicweb:facetName CDATA #IMPLIED - cubicweb:facetargs CDATA #IMPLIED - cubicweb:fallbackvid CDATA #IMPLIED - cubicweb:fname CDATA #IMPLIED - cubicweb:initfunc CDATA #IMPLIED - cubicweb:inputid CDATA #IMPLIED - cubicweb:inputname CDATA #IMPLIED - cubicweb:limit CDATA #IMPLIED - cubicweb:loadtype CDATA #IMPLIED - cubicweb:loadurl CDATA #IMPLIED - cubicweb:maxlength CDATA #IMPLIED - cubicweb:required CDATA #IMPLIED - cubicweb:rooteid CDATA #IMPLIED - cubicweb:rql CDATA #IMPLIED - cubicweb:size CDATA #IMPLIED - cubicweb:sortvalue CDATA #IMPLIED - cubicweb:target CDATA #IMPLIED - cubicweb:tindex CDATA #IMPLIED - cubicweb:tlunit CDATA #IMPLIED - cubicweb:type CDATA #IMPLIED - cubicweb:unselimg CDATA #IMPLIED - cubicweb:uselabel CDATA #IMPLIED - cubicweb:value CDATA #IMPLIED - cubicweb:variables CDATA #IMPLIED - cubicweb:vid CDATA #IMPLIED - cubicweb:wdgtype CDATA #IMPLIED - "> ] ''' - -TRANSITIONAL_DOCTYPE = u'\n' % CW_XHTML_EXTENSIONS -TRANSITIONAL_DOCTYPE_NOEXT = u'\n' -STRICT_DOCTYPE = u'\n' % CW_XHTML_EXTENSIONS STRICT_DOCTYPE_NOEXT = u'\n' +STRICT_DOCTYPE = STRICT_DOCTYPE_NOEXT # bw compat # base view object ############################################################ @@ -510,11 +471,7 @@ one to display error if the first one failed """ - @property - def doctype(self): - if self._cw.xhtml_browser(): - return STRICT_DOCTYPE - return STRICT_DOCTYPE_NOEXT + doctype = STRICT_DOCTYPE def set_stream(self, w=None): if self.w is not None: