Mercurial > genshi > mirror
changeset 400:e29a94b3ba0c trunk
Renamed `genshi.template.core` to `genshi.template.base`, mainly to avoid confusion with `genshi.core`.
| author | cmlenz |
|---|---|
| date | Thu, 18 Jan 2007 14:58:39 +0000 |
| parents | f0b785d3d407 |
| children | 68772732c896 |
| files | examples/bench/django/templates/base.html examples/bench/django/templates/template.html genshi/template/__init__.py genshi/template/base.py genshi/template/core.py genshi/template/directives.py genshi/template/loader.py genshi/template/markup.py genshi/template/plugin.py genshi/template/tests/__init__.py genshi/template/tests/base.py genshi/template/tests/core.py genshi/template/tests/markup.py genshi/template/text.py |
| diffstat | 12 files changed, 41 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- a/examples/bench/django/templates/base.html +++ b/examples/bench/django/templates/base.html @@ -3,12 +3,16 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" lang="en"> - {% block body %} - <div id="header"> - <h1>{{ title|escape }}</h1> - </div> - {{ block.super }} - <div id="footer"></div> + {% block content %} + {% block header %} + <div id="header"> + <h1>{{ title|escape }}</h1> + </div> + {% endblock %} + + {% block footer %} + <div id="footer"></div> + {% endblock %} {% endblock %} </html>
--- a/examples/bench/django/templates/template.html +++ b/examples/bench/django/templates/template.html @@ -1,22 +1,27 @@ {% extends "base.html" %} {% load bench %} -<head> - <title>${title|escape}</title> -</head> - -{% block body %} - <div>{% greeting user %}</div> - <div>{% greeting "me" %}</div> - <div>{% greeting "world" %}</div> +{% block content %} + <head> + <title>{{title|escape}}</title> + </head> - <h2>Loop</h2> - {% if items %} - <ul> - {% for item in items %} - <li{% if forloop.islast %} class="last"{% endif %}>{{ item|escape }}</li> - {% endfor %} - </ul> - {% endif %} + <body> + {% block header %}{% endblock %} + <div>{% greeting user %}</div> + <div>{% greeting "me" %}</div> + <div>{% greeting "world" %}</div> + + <h2>Loop</h2> + {% if items %} + <ul> + {% for item in items %} + <li{% if forloop.last %} class="last"{% endif %}>{{ item|escape }}</li> + {% endfor %} + </ul> + {% endif %} + + {% block footer %}{% endblock %} + </body> {% endblock %}
--- a/genshi/template/__init__.py +++ b/genshi/template/__init__.py @@ -13,7 +13,7 @@ """Implementation of the template engine.""" -from genshi.template.core import Context, Template, TemplateError, \ +from genshi.template.base import Context, Template, TemplateError, \ TemplateRuntimeError, TemplateSyntaxError, \ BadDirectiveError from genshi.template.loader import TemplateLoader, TemplateNotFound
--- a/genshi/template/directives.py +++ b/genshi/template/directives.py @@ -17,7 +17,7 @@ from genshi.core import Attrs, Stream from genshi.path import Path -from genshi.template.core import TemplateRuntimeError, TemplateSyntaxError, \ +from genshi.template.base import TemplateRuntimeError, TemplateSyntaxError, \ EXPR, _apply_directives from genshi.template.eval import Expression, _parse
--- a/genshi/template/loader.py +++ b/genshi/template/loader.py @@ -19,7 +19,7 @@ except ImportError: import dummy_threading as threading -from genshi.template.core import TemplateError +from genshi.template.base import TemplateError from genshi.util import LRUCache __all__ = ['TemplateLoader', 'TemplateNotFound']
--- a/genshi/template/markup.py +++ b/genshi/template/markup.py @@ -18,7 +18,7 @@ from genshi.core import Attrs, Namespace, Stream, StreamEventKind from genshi.core import START, END, START_NS, END_NS, TEXT, COMMENT from genshi.input import XMLParser -from genshi.template.core import BadDirectiveError, Template, \ +from genshi.template.base import BadDirectiveError, Template, \ _apply_directives, SUB from genshi.template.loader import TemplateNotFound from genshi.template.directives import *
--- a/genshi/template/plugin.py +++ b/genshi/template/plugin.py @@ -20,7 +20,7 @@ from genshi.input import ET, HTML, XML from genshi.output import DocType -from genshi.template.core import Context, Template +from genshi.template.base import Context, Template from genshi.template.eval import Undefined from genshi.template.loader import TemplateLoader from genshi.template.markup import MarkupTemplate
--- a/genshi/template/tests/__init__.py +++ b/genshi/template/tests/__init__.py @@ -16,10 +16,10 @@ def suite(): - from genshi.template.tests import core, directives, eval, loader, markup, \ + from genshi.template.tests import base, directives, eval, loader, markup, \ plugin, text suite = unittest.TestSuite() - suite.addTest(core.suite()) + suite.addTest(base.suite()) suite.addTest(directives.suite()) suite.addTest(eval.suite()) suite.addTest(loader.suite())
rename from genshi/template/tests/core.py rename to genshi/template/tests/base.py --- a/genshi/template/tests/core.py +++ b/genshi/template/tests/base.py @@ -15,7 +15,7 @@ import unittest from genshi.core import Stream -from genshi.template.core import Template, TemplateSyntaxError +from genshi.template.base import Template, TemplateSyntaxError class TemplateTestCase(unittest.TestCase):
--- a/genshi/template/tests/markup.py +++ b/genshi/template/tests/markup.py @@ -21,7 +21,7 @@ from genshi.core import Markup from genshi.input import XML -from genshi.template.core import BadDirectiveError, TemplateSyntaxError +from genshi.template.base import BadDirectiveError, TemplateSyntaxError from genshi.template.loader import TemplateLoader from genshi.template.markup import MarkupTemplate