Ticket #579: find_template.patch

django/core/template_file.py

@@ -4 +4 @@
 from django.core.template import TemplateDoesNotExist
 import os
 
-def load_template_source(template_name, template_dirs=None):
+def find_template(template_name, template_dirs=None):
+    """Locates the template file in the template directories"""
     if not template_dirs:
         template_dirs = TEMPLATE_DIRS
     tried = []
     for template_dir in template_dirs:
-        filepath = os.path.join(template_dir, template_name) + TEMPLATE_FILE_EXTENSION
-        try:
-            return open(filepath).read()
-        except IOError:
+        filepath = os.path.join(template_dir, template_name)
+        if os.path.isfile(filepath):
+            return filepath
+        else:
             tried.append(filepath)
     if template_dirs:
         error_msg = "Tried %s" % tried
     else:
         error_msg = "Your TEMPLATE_DIRS settings is empty. Change it to point to at least one template directory."
     raise TemplateDoesNotExist, error_msg
+    
+
+def load_template_source(template_name, template_dirs=None):
+    """Finds and opens the requested template, returning its contents"""
+    filepath = find_template(template_name + TEMPLATE_FILE_EXTENSION, template_dirs)
+    return open(filepath).read()