Edgewall Software

Changeset 492


Ignore:
Timestamp:
Jan 18, 2007, 3:58:39 PM (17 years ago)
Author:
cmlenz
Message:

Renamed genshi.template.core to genshi.template.base, mainly to avoid confusion with genshi.core.

Location:
trunk
Files:
10 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/examples/bench/django/templates/base.html

    r299 r492  
    44<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
    55
    6   {% block body %}
    7     <div id="header">
    8       <h1>{{ title|escape }}</h1>
    9     </div>
    10     {{ block.super }}
    11     <div id="footer"></div>
     6  {% block content %}
     7    {% block header %}
     8      <div id="header">
     9        <h1>{{ title|escape }}</h1>
     10      </div>
     11    {% endblock %}
     12
     13    {% block footer %}
     14      <div id="footer"></div>
     15    {% endblock %}
    1216  {% endblock %}
    1317

  • trunk/examples/bench/django/templates/template.html

    r299 r492  
    22{% load bench %}
    33
    4 <head>
    5   <title>${title|escape}</title>
    6 </head>
     4{% block content %}
     5  <head>
     6    <title>{{title|escape}}</title>
     7  </head>
    78
    8 {% block body %}
    9   <div>{% greeting user %}</div>
    10   <div>{% greeting "me" %}</div>
    11   <div>{% greeting "world" %}</div>
     9  <body>
     10    {% block header %}{% endblock %}
    1211
    13   <h2>Loop</h2>
    14   {% if items %}
    15     <ul>
    16       {% for item in items %}
    17         <li{% if forloop.islast %} class="last"{% endif %}>{{ item|escape }}</li>
    18       {% endfor %}
    19     </ul>
    20   {% endif %}
     12    <div>{% greeting user %}</div>
     13    <div>{% greeting "me" %}</div>
     14    <div>{% greeting "world" %}</div>
    2115
     16    <h2>Loop</h2>
     17    {% if items %}
     18      <ul>
     19        {% for item in items %}
     20          <li{% if forloop.last %} class="last"{% endif %}>{{ item|escape }}</li>
     21        {% endfor %}
     22      </ul>
     23    {% endif %}
     24
     25    {% block footer %}{% endblock %}
     26  </body>
    2227{% endblock %}

  • trunk/genshi/template/__init__.py

    r414 r492  
    1414"""Implementation of the template engine."""
    1515
    16 from genshi.template.core import Context, Template, TemplateError, \
     16from genshi.template.base import Context, Template, TemplateError, \
    1717                                 TemplateRuntimeError, TemplateSyntaxError, \
    1818                                 BadDirectiveError

  • trunk/genshi/template/directives.py

    r462 r492  
    1818from genshi.core import Attrs, Stream
    1919from genshi.path import Path
    20 from genshi.template.core import TemplateRuntimeError, TemplateSyntaxError, \
     20from genshi.template.base import TemplateRuntimeError, TemplateSyntaxError, \
    2121                                 EXPR, _apply_directives
    2222from genshi.template.eval import Expression, _parse

  • trunk/genshi/template/loader.py

    r443 r492  
    2020    import dummy_threading as threading
    2121
    22 from genshi.template.core import TemplateError
     22from genshi.template.base import TemplateError
    2323from genshi.util import LRUCache
    2424

  • trunk/genshi/template/markup.py

    r463 r492  
    1919from genshi.core import START, END, START_NS, END_NS, TEXT, COMMENT
    2020from genshi.input import XMLParser
    21 from genshi.template.core import BadDirectiveError, Template, \
     21from genshi.template.base import BadDirectiveError, Template, \
    2222                                 _apply_directives, SUB
    2323from genshi.template.loader import TemplateNotFound

  • trunk/genshi/template/plugin.py

    r457 r492  
    2121from genshi.input import ET, HTML, XML
    2222from genshi.output import DocType
    23 from genshi.template.core import Context, Template
     23from genshi.template.base import Context, Template
    2424from genshi.template.eval import Undefined
    2525from genshi.template.loader import TemplateLoader

  • trunk/genshi/template/tests/__init__.py

    r433 r492  
    1717
    1818def suite():
    19     from genshi.template.tests import core, directives, eval, loader, markup, \
     19    from genshi.template.tests import base, directives, eval, loader, markup, \
    2020                                      plugin, text
    2121    suite = unittest.TestSuite()
    22     suite.addTest(core.suite())
     22    suite.addTest(base.suite())
    2323    suite.addTest(directives.suite())
    2424    suite.addTest(eval.suite())

  • trunk/genshi/template/tests/base.py

    r491 r492  
    1616
    1717from genshi.core import Stream
    18 from genshi.template.core import Template, TemplateSyntaxError
     18from genshi.template.base import Template, TemplateSyntaxError
    1919
    2020

  • trunk/genshi/template/tests/markup.py

    r463 r492  
    2222from genshi.core import Markup
    2323from genshi.input import XML
    24 from genshi.template.core import BadDirectiveError, TemplateSyntaxError
     24from genshi.template.base import BadDirectiveError, TemplateSyntaxError
    2525from genshi.template.loader import TemplateLoader
    2626from genshi.template.markup import MarkupTemplate

  • trunk/genshi/template/text.py

    r456 r492  
    1616import re
    1717
    18 from genshi.template.core import BadDirectiveError, Template, SUB
     18from genshi.template.base import BadDirectiveError, Template, SUB
    1919from genshi.template.directives import *
    2020
Note: See TracChangeset for help on using the changeset viewer.