Commit 11859266 authored by Aymeric Augustin's avatar Aymeric Augustin
Browse files

Exposed Engine in the django.template namespace. 

It's the main entrypoint to the refactored template system.
parent f7c287fc

django/template/__init__.py

+3 −1
Original line number Diff line number Diff line
@@ -41,12 +41,14 @@ Shared: 


### Multiple Template Engines



from .engine import Engine



from .utils import EngineHandler





engines = EngineHandler()



__all__ = ('engines',)

__all__ = ('Engine', 'engines')





### Django Template Language

django/template/engine.py

+4 −3
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ from django.utils.deprecation import RemovedInDjango20Warning 
from django.utils.functional import cached_property

from django.utils.module_loading import import_string



from . import engines

from .base import Context, Lexer, Parser, Template, TemplateDoesNotExist

from .context import _builtin_context_processors
@@ -68,8 +67,10 @@ class Engine(object): 
        >>> template.render(context)

        'Hello world!'

        """

        # Since DjangoTemplates is a wrapper around this Engine class, a local

        # import is mandatory to avoid an import loop.

        # Since Engine is imported in django.template and since

        # DjangoTemplates is a wrapper around this Engine class,

        # local imports are required to avoid import loops.

        from django.template import engines

        from django.template.backends.django import DjangoTemplates

        django_engines = [engine for engine in engines.all()

                          if isinstance(engine, DjangoTemplates)]