Ticket #4278: template-dirs.diff

django/template/loader.py

@@ -149 +149 @@
         raise Exception("Found a compiled template that is incompatible with the deprecated `django.template.loaders.find_template_source` function.")
     return template, origin
 
-def get_template(template_name):
+def get_template(template_name, dirs=None):
     """
     Returns a compiled Template object for the given template name,
     handling template inheritance recursively.
     """
-    template, origin = find_template(template_name)
+    template, origin = find_template(template_name, dirs)
     if not hasattr(template, 'render'):
         # template needs to be compiled
         template = get_template_from_string(template, origin, template_name)
@@ -167 +167 @@
     """
     return Template(source, origin, name)
 
-def render_to_string(template_name, dictionary=None, context_instance=None):
+def render_to_string(template_name, dictionary=None, context_instance=None, dirs=None):
     """
     Loads the given template_name and renders it with the given dictionary as
     context. The template_name may be a string to load a single template using
@@ -176 +176 @@
     """
     dictionary = dictionary or {}
     if isinstance(template_name, (list, tuple)):
-        t = select_template(template_name)
+        t = select_template(template_name, dirs)
     else:
-        t = get_template(template_name)
+        t = get_template(template_name, dirs)
     if context_instance:
         context_instance.update(dictionary)
     else:
         context_instance = Context(dictionary)
     return t.render(context_instance)
 
-def select_template(template_name_list):
+def select_template(template_name_list, dirs=None):
     "Given a list of template names, returns the first that can be loaded."
     for template_name in template_name_list:
         try:
-            return get_template(template_name)
+            return get_template(template_name, dirs)
         except TemplateDoesNotExist:
             continue
     # If we get here, none of the templates could be loaded