# HG changeset patch # User cmlenz # Date 1164228810 0 # Node ID eb2ef86a2cec7b91ee5042a78da669a7c86a35f0 # Parent 240179cd1251f48cf588dd1d64dfdc03b13c5c01 Ported [409] to 0.3.x. diff --git a/examples/bench/basic.py b/examples/bench/basic.py --- a/examples/bench/basic.py +++ b/examples/bench/basic.py @@ -130,7 +130,7 @@ print '--------------------------------------------------------' else: print '%s:' % engine.capitalize(), - t = timeit.Timer(setup='from __main__ import %s; render = %s("%s", %s)' + t = timeit.Timer(setup='from __main__ import %s; render = %s(r"%s", %s)' % (engine, engine, dirname, verbose), stmt='render()') time = t.timeit(number=number) / number diff --git a/examples/bench/bigtable.py b/examples/bench/bigtable.py --- a/examples/bench/bigtable.py +++ b/examples/bench/bigtable.py @@ -9,8 +9,6 @@ import sys import timeit -import cElementTree as cet -from elementtree import ElementTree as et from genshi.builder import tag from genshi.template import MarkupTemplate import neo_cgi @@ -18,6 +16,16 @@ import neo_util try: + from elementtree import ElementTree as et +except ImportError: + et = None + +try: + import cElementTree as cet +except ImportError: + cet = None + +try: import neo_cgi, neo_cs, neo_util except ImportError: neo_cgi = None @@ -106,33 +114,37 @@ kid_tmpl.table = table kid_tmpl.serialize(output='html') - def test_kid_et(): - """Kid template + cElementTree""" + + if cet: + def test_kid_et(): + """Kid template + cElementTree""" + _table = cet.Element('table') + for row in table: + td = cet.SubElement(_table, 'tr') + for c in row.values(): + cet.SubElement(td, 'td').text=str(c) + kid_tmpl2.table = _table + kid_tmpl2.serialize(output='html') + +if et: + def test_et(): + """ElementTree""" + _table = et.Element('table') + for row in table: + tr = et.SubElement(_table, 'tr') + for c in row.values(): + et.SubElement(tr, 'td').text=str(c) + et.tostring(_table) + +if cet: + def test_cet(): + """cElementTree""" _table = cet.Element('table') for row in table: - td = cet.SubElement(_table, 'tr') + tr = cet.SubElement(_table, 'tr') for c in row.values(): - cet.SubElement(td, 'td').text=str(c) - kid_tmpl2.table = _table - kid_tmpl2.serialize(output='html') - -def test_et(): - """ElementTree""" - _table = et.Element('table') - for row in table: - tr = et.SubElement(_table, 'tr') - for c in row.values(): - et.SubElement(tr, 'td').text=str(c) - et.tostring(_table) - -def test_cet(): - """cElementTree""" - _table = cet.Element('table') - for row in table: - tr = cet.SubElement(_table, 'tr') - for c in row.values(): - cet.SubElement(tr, 'td').text=str(c) - cet.tostring(_table) + cet.SubElement(tr, 'td').text=str(c) + cet.tostring(_table) if neo_cgi: def test_clearsilver():