Ticket #582: template_eggs-3.patch

django/core/template_eggs.py

@@ +1 @@
+"""Wrapper for loading templates from eggs via pkg_resources.resource_string."""
+
+try:
+    from pkg_resources import resource_string
+except ImportError:
+    # python2.3 compatibility hack
+    def resource_string(*args):
+        raise AssertionError, 'pkg_resource required for template_eggs'
+
+from django.conf.settings import INSTALLED_APPS, TEMPLATE_FILE_EXTENSION
+from django.core.template import TemplateDoesNotExist
+
+def load_template_source(name, dirs=None):
+    """I load templates from Python eggs via pkg_resource.resource_string.
+
+    For every install app I try to get the resource (app, name)."""
+
+    pkg_name = 'templates/' + name + TEMPLATE_FILE_EXTENSION
+
+    for app in INSTALLED_APPS:
+        try:
+            return resource_string(app, pkg_name)
+        except:
+            pass
+
+    raise TemplateDoesNotExist, name

django/core/template_loader.py

@@ -1 +1 @@
 "Wrapper for loading templates from storage of some sort (e.g. files or db)"
 import template
-from template_file import load_template_source
 
+from django.conf.settings import TEMPLATE_SOURCE_LOADERS
+from django.core import exceptions
+
+template_source_loaders = []
+for path in TEMPLATE_SOURCE_LOADERS:
+    module, attr = path.rsplit('.', 1)
+    try:
+        mod = __import__(module, globals(), locals(), [attr])
+    except ImportError, e:
+        raise exceptions.ImproperlyConfigured, 'Error importing template_source_loader %s: "%s"' % (module, e)
+    try:
+        template_source_loaders.append(getattr(mod, attr))
+    except AttributeError:
+        raise exceptions.ImproperlyConfigured, 'Module "%s" does not define a "%s" callable template_source_loader' % (module, attr)
+
+def load_template_source(name, dirs=None):
+    for loader in template_source_loaders:
+        try:
+            return loader(name, dirs)
+        except template.TemplateDoesNotExist:
+            pass
+    raise template.TemplateDoesNotExist, name
+
 class ExtendsError(Exception):
     pass
 

django/conf/global_settings.py

@@ -58 +58 @@
 # Extension on all templates.
 TEMPLATE_FILE_EXTENSION = '.html'
 
+# Callables which know how to import template sources from various
+# sources; the expected interface is callable(name, [dirs]), where dirs
+# is a list of directories to search instead of TEMPLATE_DIRS.
+TEMPLATE_SOURCE_LOADERS = (
+    'django.core.template_file.load_template_source',
+    'django.core.template_eggs.load_template_source',
+)
+
 # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
 # trailing slash.
 # Examples: "http://foo.com/media/", "/media/".