# HG changeset patch
# User cmlenz
# Date 1169132319 0
# Node ID e29a94b3ba0c4e9dd0ccc545e1522e0d18c1fdd6
# Parent f0b785d3d407e07637740e515350c20ca994998a
Renamed `genshi.template.core` to `genshi.template.base`, mainly to avoid confusion with `genshi.core`.
diff --git a/examples/bench/django/templates/base.html b/examples/bench/django/templates/base.html
--- 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">
- {% block body %}
-
- {{ block.super }}
-
+ {% block content %}
+ {% block header %}
+
+ {% endblock %}
+
+ {% block footer %}
+
+ {% endblock %}
{% endblock %}
diff --git a/examples/bench/django/templates/template.html b/examples/bench/django/templates/template.html
--- a/examples/bench/django/templates/template.html
+++ b/examples/bench/django/templates/template.html
@@ -1,22 +1,27 @@
{% extends "base.html" %}
{% load bench %}
-
- ${title|escape}
-
-
-{% block body %}
- {% greeting user %}
- {% greeting "me" %}
- {% greeting "world" %}
+{% block content %}
+
+ {{title|escape}}
+
- Loop
- {% if items %}
-
- {% for item in items %}
- {{ item|escape }}
- {% endfor %}
-
- {% endif %}
+
+ {% block header %}{% endblock %}
+ {% greeting user %}
+ {% greeting "me" %}
+ {% greeting "world" %}
+
+ Loop
+ {% if items %}
+
+ {% for item in items %}
+ {{ item|escape }}
+ {% endfor %}
+
+ {% endif %}
+
+ {% block footer %}{% endblock %}
+
{% endblock %}
diff --git a/genshi/template/__init__.py b/genshi/template/__init__.py
--- 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
diff --git a/genshi/template/core.py b/genshi/template/base.py
rename from genshi/template/core.py
rename to genshi/template/base.py
diff --git a/genshi/template/directives.py b/genshi/template/directives.py
--- 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
diff --git a/genshi/template/loader.py b/genshi/template/loader.py
--- 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']
diff --git a/genshi/template/markup.py b/genshi/template/markup.py
--- 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 *
diff --git a/genshi/template/plugin.py b/genshi/template/plugin.py
--- 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
diff --git a/genshi/template/tests/__init__.py b/genshi/template/tests/__init__.py
--- 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())
diff --git a/genshi/template/tests/core.py b/genshi/template/tests/base.py
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):
diff --git a/genshi/template/tests/markup.py b/genshi/template/tests/markup.py
--- 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
diff --git a/genshi/template/text.py b/genshi/template/text.py
--- a/genshi/template/text.py
+++ b/genshi/template/text.py
@@ -15,7 +15,7 @@
import re
-from genshi.template.core import BadDirectiveError, Template, SUB
+from genshi.template.base import BadDirectiveError, Template, SUB
from genshi.template.directives import *