codenotifier - Trac: revision 7458

Project: Trac

Revision: 7458

Author: jonas

Date: 13 Aug 2008 17:17:53

Diff at Trac: http://trac.edgewall.org/changeset/7458

Changes:

0.11-stable: Added XHTML outout validation, closes #7445. Thanks Remy.

Files:
modified: /branches/0.11-stable/trac/templates/diff_div.html (try)
modified: /branches/0.11-stable/trac/tests/functional/better_twill.py (try)
added: /branches/0.11-stable/trac/tests/functional/xhtml1-strict.dtd (try)
added: /branches/0.11-stable/trac/tests/functional/xhtml-special.ent (try)
added: /branches/0.11-stable/trac/tests/functional/xhtml-lat1.ent (try)
modified: /branches/0.11-stable/trac/ticket/templates/ticket.html (try)
modified: /branches/0.11-stable/trac/versioncontrol/templates/revisionlog.html (try)
added: /branches/0.11-stable/trac/tests/functional/xhtml-symbol.ent (try)
modified: /branches/0.11-stable/trac/tests/functional/__init__.py (try)
modified: /branches/0.11-stable/trac/ticket/templates/query_results.html (try)
modified: /branches/0.11-stable/trac/versioncontrol/templates/browser.html (try)

Diff:

......	@@ -35,7 +35,7 @@
35	35	xmlns:xi="http://www.w3.org/2001/XInclude"
36	36	class="diff">
37	37
38		<ul class="entries">
	38	<ul py:if="any(item.diffs or item.props for item in changes)" class="entries">
39	39	<py:for each="idx, item in enumerate(changes)">
40	40	<li py:if="item.diffs or item.props" class="entry" py:with="comments = item.get('comments')">
41	41	<h2 id="${not no_id and 'file%s' % idx or None}" py:choose="">

......	@@ -5,12 +5,20 @@
5	5	"""
6	6
7	7	import os
	8	from os.path import abspath, dirname, join
8	9	import sys
9	10	try:
10	11	from cStringIO import StringIO
11	12	except ImportError:
12	13	from StringIO import StringIO
13	14
	15	# On OSX lxml needs to be imported before twill to avoid Resolver issues
	16	# somehow caused by the mac specific 'ic' module
	17	try:
	18	from lxml import etree
	19	except ImportError:
	20	pass
	21
14	22	try:
15	23	import twill
16	24	except ImportError:
......	@@ -38,6 +46,48 @@
38	46	tc = twill.commands
39	47	b = twill.get_browser()
40	48
	49	# Setup XHTML validation for all retrieved pages
	50	try:
	51	from lxml import etree
	52	except ImportError:
	53	print "SKIP: validation of XHTML output in functional tests " \
	54	"(no lxml installed)"
	55	else:
	56	class _Resolver(etree.Resolver):
	57	base_dir = dirname(abspath(__file__))
	58
	59	def resolve(self, system_url, public_id, context):
	60	return self.resolve_filename(join(self.base_dir,
	61	system_url.split("/")[-1]),
	62	context)
	63
	64	_parser = etree.XMLParser(dtd_validation=True)
	65	_parser.resolvers.add(_Resolver())
	66	etree.set_default_parser(_parser)
	67
	68	def _format_error_log(data, log):
	69	msg = []
	70	for each in log:
	71	context = data.splitlines()[max(0, each.line - 5):
	72	each.line + 6]
	73	msg.append("%s\n\nURL: %s\nLine %d, column %d\n\n%s" % (
	74	each.message, each.filename, each.line, each.column,
	75	"\n".join(context)))
	76	return "\n".join(msg)
	77
	78	def _validate_xhtml(func_name, args, *kwargs):
	79	page = b.get_html()
	80	if "xhtml1-strict.dtd" not in page:
	81	return
	82	etree.clear_error_log()
	83	try:
	84	doc = etree.parse(StringIO(page), base_url=b.get_url())
	85	except etree.XMLSyntaxError, e:
	86	raise twill.errors.TwillAssertionError(
	87	_format_error_log(page, e.error_log))
	88
	89	b._post_load_hooks.append(_validate_xhtml)
	90
41	91	# When we can't find something we expected, or find something we didn't
42	92	# expect, it helps the debugging effort to have a copy of the html to
43	93	# analyze.

......	@@ -0,0 +1,978 @@
	1	<!--
	2	Extensible HTML version 1.0 Strict DTD
	3
	4	This is the same as HTML 4 Strict except for
	5	changes due to the differences between XML and SGML.
	6
	7	Namespace = http://www.w3.org/1999/xhtml
	8
	9	For further information, see: http://www.w3.org/TR/xhtml1
	10
	11	Copyright (c) 1998-2002 W3C (MIT, INRIA, Keio),
	12	All Rights Reserved.
	13
	14	This DTD module is identified by the PUBLIC and SYSTEM identifiers:
	15
	16	PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
	17	SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"
	18
	19	$Revision: 1.1 $
	20	$Date: 2002/08/01 13:56:03 $
	21
	22	-->
	23
	24	<!--================ Character mnemonic entities =========================-->
	25
	26	<!ENTITY % HTMLlat1 PUBLIC
	27	"-//W3C//ENTITIES Latin 1 for XHTML//EN"
	28	"xhtml-lat1.ent">
	29	%HTMLlat1;
	30
	31	<!ENTITY % HTMLsymbol PUBLIC
	32	"-//W3C//ENTITIES Symbols for XHTML//EN"
	33	"xhtml-symbol.ent">
	34	%HTMLsymbol;
	35
	36	<!ENTITY % HTMLspecial PUBLIC
	37	"-//W3C//ENTITIES Special for XHTML//EN"
	38	"xhtml-special.ent">
	39	%HTMLspecial;