Ticket #17199: #17199-template_loader_origin.diff

django/template/loader.py

@@ -46 +46 @@
         origin = make_origin(display_name, self.load_template_source, template_name, template_dirs)
         try:
             template = get_template_from_string(source, origin, template_name)
-            return template, None
+            return template, origin and origin.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.

django/template/loaders/cached.py

@@ -50 +50 @@
                     # 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
+            self.template_cache[key] = (template, origin and origin.name)
+        return self.template_cache[key]
 
     def reset(self):
         "Empty the template cache."