# HG changeset patch # User cmlenz # Date 1152964753 0 # Node ID 5ca4be55ad0b8af02992e2db4b1cc39471ad8804 # Parent d604860180045fbe5a029243299fc66227c97a7e Some minor cleanup. diff --git a/examples/basic/kidrun.py b/examples/basic/kidrun.py --- a/examples/basic/kidrun.py +++ b/examples/basic/kidrun.py @@ -37,9 +37,12 @@ if __name__ == '__main__': if '-p' in sys.argv: - import profile, pstats - profile.run('test()', '.tmpl_prof') - stats = pstats.Stats('.tmpl_prof') - stats.strip_dirs().sort_stats('time').print_stats(10) + import hotshot, hotshot.stats + prof = hotshot.Profile("template.prof") + benchtime = prof.runcall(test) + stats = hotshot.stats.load("template.prof") + stats.strip_dirs() + stats.sort_stats('time', 'calls') + stats.print_stats() else: test() diff --git a/markup/eval.py b/markup/eval.py --- a/markup/eval.py +++ b/markup/eval.py @@ -267,8 +267,3 @@ # return self.nextBlock(return_) self.emit('LOAD_NAME', 'val') - - -if __name__ == '__main__': - import doctest - doctest.testmod() diff --git a/markup/template.py b/markup/template.py --- a/markup/template.py +++ b/markup/template.py @@ -11,28 +11,7 @@ # individuals. For the exact contribution history, see the revision # history and logs, available at http://markup.edgewall.org/log/. -"""Template engine that is compatible with Kid (http://kid.lesscode.org) to a -certain extent. - -Differences include: - * No generation of Python code for a template; the template is "interpreted" - * No support for processing instructions - * Expressions are evaluated in a more flexible manner, meaning you can use e.g. - attribute access notation to access items in a dictionary, etc - * Use of XInclude and match templates instead of Kid's py:extends/py:layout - directives - * Real (thread-safe) search path support - * No dependency on ElementTree (due to the lack of pos info) - * The original pos of parse events is kept throughout the processing - pipeline, so that errors can be tracked back to a specific line/column in - the template file - * py:match directives use (basic) XPath expressions to match against input - nodes, making match templates more powerful while keeping the syntax simple - -Todo items: - * Improved error reporting - * Support for list comprehensions and generator expressions in expressions -""" +"""Implementation of the template engine.""" try: from collections import deque