Browse files

Refs #13573 -- Modified the key technique added in r13295 to be more …

…robust against potential key collisions while keeping key names human-readable. Thanks to Alex for being finicky.

git-svn-id: bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent 5acd9cd commit 84060a1f7aff712f6fde71884c501b50c9ef3d46 @freakboy3742 freakboy3742 committed May 21, 2010
Showing with 6 additions and 3 deletions.
  1. +6 −3 django/template/loaders/
@@ -3,10 +3,11 @@
to load templates from them in order, caching the result.
+from django.core.exceptions import ImproperlyConfigured
from django.template import TemplateDoesNotExist
from django.template.loader import BaseLoader, get_template_from_string, find_template_loader, make_origin
+from django.utils.hashcompat import sha_constructor
from django.utils.importlib import import_module
-from django.core.exceptions import ImproperlyConfigured
class Loader(BaseLoader):
is_usable = True
@@ -34,8 +35,10 @@ def find_template(self, name, dirs=None):
raise TemplateDoesNotExist(name)
def load_template(self, template_name, template_dirs=None):
- # Use hash(..) to avoid saving potentially large template_dirs values
- key = hash((template_name, template_dirs))
+ key = template_name
+ if template_dirs:
+ # If template directories were specified, use a hash to differentiate
+ key = '-'.join([template_name, sha_constructor('|'.join(template_dirs)).hexdigest()])
if key not in self.template_cache:
template, origin = self.find_template(template_name, template_dirs)

0 comments on commit 84060a1

Please sign in to comment.