Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #6950 -- Modified initialization of template loaders to use a t…

…emporary variable instead of directly modifying the global loader list. Thanks, mrts.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@7563 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit f696c175d855be16ecb6acadee75044db0677f7a 1 parent 5837a45
@freakboy3742 freakboy3742 authored
Showing with 3 additions and 2 deletions.
  1. +3 −2 django/template/loader.py
View
5 django/template/loader.py
@@ -46,7 +46,7 @@ def find_template_source(name, dirs=None):
# circular import errors. See Django ticket #1292.
global template_source_loaders
if template_source_loaders is None:
- template_source_loaders = []
+ loaders = []
for path in settings.TEMPLATE_LOADERS:
i = path.rfind('.')
module, attr = path[:i], path[i+1:]
@@ -62,7 +62,8 @@ def find_template_source(name, dirs=None):
import warnings
warnings.warn("Your TEMPLATE_LOADERS setting includes %r, but your Python installation doesn't support that type of template loading. Consider removing that line from TEMPLATE_LOADERS." % path)
else:
- template_source_loaders.append(func)
+ loaders.append(func)
+ template_source_loaders = tuple(loaders)
for loader in template_source_loaders:
try:
source, display_name = loader(name, dirs)
Please sign in to comment.
Something went wrong with that request. Please try again.