From: <go...@us...> - 2010-07-19 16:07:27
|
Author: goodger Date: 2010-07-19 18:07:19 +0200 (Mon, 19 Jul 2010) New Revision: 6379 Modified: trunk/docutils/test/test_writers/test_html4css1_template.py trunk/docutils/test/test_writers/test_s5.py Log: updated version text dynamically (so we won't have to do this again\!) Modified: trunk/docutils/test/test_writers/test_html4css1_template.py =================================================================== --- trunk/docutils/test/test_writers/test_html4css1_template.py 2010-07-12 19:30:24 UTC (rev 6378) +++ trunk/docutils/test/test_writers/test_html4css1_template.py 2010-07-19 16:07:19 UTC (rev 6379) @@ -49,7 +49,7 @@ head = """\ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<meta name="generator" content="Docutils 0.7: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils %(version)s: http://docutils.sourceforge.net/" /> <title>Document Title</title> <meta name="author" content="Me" />""" @@ -106,7 +106,7 @@ head = """\ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<meta name="generator" content="Docutils 0.7: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils %(version)s: http://docutils.sourceforge.net/" /> <title>Document Title</title> <meta name="author" content="Me" />""" @@ -175,7 +175,7 @@ meta = """\ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<meta name="generator" content="Docutils 0.7: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils %(version)s: http://docutils.sourceforge.net/" /> <meta name="author" content="Me" />""" @@ -187,13 +187,13 @@ html_prolog = """\ -<?xml version="1.0" encoding="%s" ?> +<?xml version="1.0" encoding="%%s" ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">""" html_head = """\ -<meta http-equiv="Content-Type" content="text/html; charset=%s" /> -<meta name="generator" content="Docutils 0.7: http://docutils.sourceforge.net/" /> +<meta http-equiv="Content-Type" content="text/html; charset=%%s" /> +<meta name="generator" content="Docutils %(version)s: http://docutils.sourceforge.net/" /> <title>Document Title</title> <meta name="author" content="Me" />""" @@ -227,7 +227,7 @@ <hr class="footer" /> footer text </div>""" -'''] +''' % {'version': DocutilsTestSupport.docutils.__version__}] ] if __name__ == '__main__': Modified: trunk/docutils/test/test_writers/test_s5.py =================================================================== --- trunk/docutils/test/test_writers/test_s5.py 2010-07-12 19:30:24 UTC (rev 6378) +++ trunk/docutils/test/test_writers/test_s5.py 2010-07-19 16:07:19 UTC (rev 6379) @@ -21,6 +21,8 @@ s.generateTests(totest_2) return s +interpolations = {'version': DocutilsTestSupport.docutils.__version__} + totest_1 = {} totest_2 = {} @@ -43,7 +45,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<meta name="generator" content="Docutils 0.7: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils %(version)s: http://docutils.sourceforge.net/" /> <meta name="version" content="S5 1.1" /> <title>Show Title</title> <link rel="stylesheet" href="../docutils/writers/html4css1/html4css1.css" type="text/css" /> @@ -91,7 +93,7 @@ </div> </body> </html> -"""] +""" % interpolations] ] totest_2['settings'] = [ @@ -108,7 +110,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<meta name="generator" content="Docutils 0.7: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils %(version)s: http://docutils.sourceforge.net/" /> <meta name="version" content="S5 1.1" /> <title>Bogus Slide Show</title> <link rel="stylesheet" href="../docutils/writers/html4css1/html4css1.css" type="text/css" /> @@ -151,7 +153,7 @@ </div> </body> </html> -"""] +""" % interpolations] ] if __name__ == '__main__': |