Ticket #19949: #19949-cache_non_existent_templates.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, 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)
-                    # of the actual template that does not exist.
-                    return template, origin
-            self.template_cache[key] = template
-        return self.template_cache[key], None
+        template_tuple = self.template_cache.get(key)
+        if template_tuple is None:
+            try:
+                template, origin = self.find_template(template_name, template_dirs)
+            except TemplateDoesNotExist:
+                template_tuple = TemplateDoesNotExist
+            else:
+                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)
+                        # of the actual template that does not exist.
+                        pass
+                template_tuple = (template, origin)
+            self.template_cache[key] = template_tuple
+        if template_tuple is TemplateDoesNotExist:
+            raise TemplateDoesNotExist
+        return template_tuple
 
     def reset(self):
         "Empty the template cache."