Ticket #10067: tagload.diff

django/conf/global_settings.py

@@ -169 +169 @@
 # Output to use in template system for invalid (e.g. misspelled) variables.
 TEMPLATE_STRING_IF_INVALID = ''
 
+# Base to search for tags to {% load %}
+TEMPLATE_MODULES=( 'django.templatetags', )
+
 # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
 # trailing slash.
 # Examples: "http://foo.com/media/", "/media/".

django/template/defaulttags.py

@@ -872 +872 @@
     bits = token.contents.split()
     for taglib in bits[1:]:
         # add the library to the parser
-        try:
-            lib = get_library("django.templatetags.%s" % taglib)
-            parser.add_library(lib)
-        except InvalidTemplateLibrary, e:
-            raise TemplateSyntaxError("'%s' is not a valid tag library: %s" %
-                                      (taglib, e))
+        resolved = False
+        for mod in settings.TEMPLATE_MODULES:
+            try:
+                lib = get_library("%s.%s" % (mod, taglib))
+                parser.add_library(lib)
+                resolved = True
+                break
+            except InvalidTemplateLibrary:
+                pass
+        if not resolved:
+            raise TemplateSyntaxError("'%s' is not a valid tag library" % taglib)
     return LoadNode()
 load = register.tag(load)