# HG changeset patch # User cmlenz # Date 1183054335 0 # Node ID 0449396999c57f591f4c598159feee38964eb2a2 # Parent 1912af29ac701253efc5f9b9008625037468fea6 Replace Myghty by Mako in bigtable benchmark, apply escaping in Mako templates. diff --git a/examples/bench/bigtable.py b/examples/bench/bigtable.py --- a/examples/bench/bigtable.py +++ b/examples/bench/bigtable.py @@ -41,9 +41,9 @@ DjangoContext = DjangoTemplate = None try: - from myghty.interp import Interpreter as MyghtyInterpreter + from mako.template import Template as MakoTemplate except ImportError: - MyghtyInterpreter = None + MakoTemplate = None table = [dict(a=1,b=2,c=3,d=4,e=5,f=6,g=7,h=8,i=9,j=10) for x in range(1000)] @@ -74,23 +74,21 @@ context = DjangoContext({'table': table}) django_tmpl.render(context) -if MyghtyInterpreter: - interpreter = MyghtyInterpreter() - component = interpreter.make_component(""" +if MakoTemplate: + mako_tmpl = MakoTemplate(""" -% for row in ARGS['table']: - -% for col in row.values(): - -% -% - + % for row in table: + + % for col in row.values(): + + % endfor + + % endfor
<% col %>
${ col | h }
""") - def test_myghty(): - """Myghty Template""" - buf = StringIO() - interpreter.execute(component, request_args={'table':table}, out_buffer=buf) + def test_mako(): + """Mako Template""" + mako_tmpl.render(table=table) def test_genshi(): """Genshi template""" @@ -186,7 +184,7 @@ def run(which=None, number=10): tests = ['test_builder', 'test_genshi', 'test_genshi_builder', - 'test_myghty', 'test_kid', 'test_kid_et', 'test_et', 'test_cet', + 'test_mako', 'test_kid', 'test_kid_et', 'test_et', 'test_cet', 'test_clearsilver', 'test_django'] if which: diff --git a/examples/bench/mako/header.html b/examples/bench/mako/header.html --- a/examples/bench/mako/header.html +++ b/examples/bench/mako/header.html @@ -1,5 +1,5 @@ diff --git a/examples/bench/mako/template.html b/examples/bench/mako/template.html --- a/examples/bench/mako/template.html +++ b/examples/bench/mako/template.html @@ -7,7 +7,7 @@ <%def name="greeting(name)"> -

Hello, ${name}!

+

Hello, ${name | h}!

<%include file="header.html"/> @@ -20,7 +20,7 @@ % if items: % endif