p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Moved the loader tags registration with the other builtins.

This commit is contained in:
Baptiste Mispelon 2014-01-19 20:11:32 +01:00
parent 51832c8aec
commit 34263c67b4
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
django/template/base.py
View File

@ -1354,3 +1354,4 @@ def add_to_builtins(module):
add_to_builtins('django.template.defaulttags')
add_to_builtins('django.template.defaultfilters')
add_to_builtins('django.template.loader_tags')

4
django/template/loader.py
View File

@ -26,7 +26,7 @@
# installed, because pkg_resources is necessary to read eggs.
from django.core.exceptions import ImproperlyConfigured
from django.template.base import Origin, Template, Context, TemplateDoesNotExist, add_to_builtins
from django.template.base import Origin, Template, Context, TemplateDoesNotExist
from django.conf import settings
from django.utils.module_loading import import_by_path
from django.utils import six
@ -191,5 +191,3 @@ def select_template(template_name_list, dirs=None):
continue
# If we get here, none of the templates could be loaded
raise TemplateDoesNotExist(', '.join(not_found))
add_to_builtins('django.template.loader_tags')