mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #13573 -- Corrected problem with template caching when template directories are provided. Thanks to lamby for the report.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13295 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee
2010-05-21 08:54:15 +00:00
parent 6b2fd346ad
commit 8a6cb3d969
4 changed files with 35 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
django/template/loaders/cached.py
View File

@@ -34,19 +34,22 @@ class Loader(BaseLoader):
raise TemplateDoesNotExist(name)
def load_template(self, template_name, template_dirs=None):
if template_name not in self.template_cache:
# Use hash(..) to avoid saving potentially large template_dirs values
key = hash((template_name, template_dirs))
if key not in self.template_cache:
template, origin = self.find_template(template_name, template_dirs)
if not hasattr(template, 'render'):
try:
template = get_template_from_string(template, origin, template_name)
except TemplateDoesNotExist:
# If compiling the template we found raises TemplateDoesNotExist,
# back off to returning the source and display name for the template
# we were asked to load. This allows for correct identification (later)
# If compiling the template we found raises TemplateDoesNotExist,
# back off to returning the source and display name for the template
# we were asked to load. This allows for correct identification (later)
# of the actual template that does not exist.
return template, origin
self.template_cache[template_name] = template
return self.template_cache[template_name], None
self.template_cache[key] = template
return self.template_cache[key], None
def reset(self):
"Empty the template cache."