Ticket #19511: #19510-thread_safe_template_cache.diff

django/template/loaders/cached.py

@@ -42 +42 @@
             # If template directories were specified, use a hash to differentiate
             key = '-'.join([template_name, hashlib.sha1('|'.join(template_dirs)).hexdigest()])
 
-        if key not in self.template_cache:
+        template_tuple = self.template_cache.get(key)
+        if template_tuple is None:
             template, origin = self.find_template(template_name, template_dirs)
             if not hasattr(template, 'render'):
                 try:
@@ -52 +53 @@
                     # 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[key] = template
-        return self.template_cache[key], None
+                    return template, origin and origin.name
+            template_tuple = (template, origin and origin.name)
+            self.template_cache[key] = template_tuple
+        return template_tuple
 
     def reset(self):
         "Empty the template cache."