Commit 22746d32 authored by Adrian Holovaty's avatar Adrian Holovaty
Browse files

Added a get_template_sources generator function to filesystem and... 

Added a get_template_sources generator function to filesystem and app_directories template loaders, so template-loader debugger can hook into it. Refs #892.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@1399 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent c616d869

django/core/template/loaders/app_directories.py

+5 −2
Original line number Diff line number Diff line
@@ -27,9 +27,12 @@ for app in INSTALLED_APPS: 
# It won't change, so convert it to a tuple to save memory.

app_template_dirs = tuple(app_template_dirs)



def load_template_source(template_name, template_dirs=None):

def get_template_sources(template_name, template_dirs=None):

    for template_dir in app_template_dirs:

        filepath = os.path.join(template_dir, template_name) + TEMPLATE_FILE_EXTENSION

        yield os.path.join(template_dir, template_name) + TEMPLATE_FILE_EXTENSION



def load_template_source(template_name, template_dirs=None):

    for filepath in get_template_sources(template_name, template_dirs):

        try:

            return (open(filepath).read(), filepath)

        except IOError:

django/core/template/loaders/filesystem.py

+6 −3
Original line number Diff line number Diff line
@@ -4,12 +4,15 @@ from django.conf.settings import TEMPLATE_DIRS, TEMPLATE_FILE_EXTENSION 
from django.core.template import TemplateDoesNotExist

import os



def load_template_source(template_name, template_dirs=None):

def get_template_sources(template_name, template_dirs=None):

    if not template_dirs:

        template_dirs = TEMPLATE_DIRS

    tried = []

    for template_dir in template_dirs:

        filepath = os.path.join(template_dir, template_name) + TEMPLATE_FILE_EXTENSION

        yield os.path.join(template_dir, template_name) + TEMPLATE_FILE_EXTENSION



def load_template_source(template_name, template_dirs=None):

    tried = []

    for filepath in get_template_sources(template_name, template_dirs):

        try:

            return (open(filepath).read(), filepath)

        except IOError:

django/core/template/loader.py

+1 −1

File changed.

Contains only whitespace changes.