Ticket #1675: ticket_1675.diff

django/template/__init__.py

@@ -861 +861 @@
         try:
             mod = __import__(module_name, '', '', [''])
         except ImportError, e:
-            raise InvalidTemplateLibrary, "Could not load template library from %s, %s" % (module_name, e)
+            raise ImportError, "Could not load template library from %s, %s" % (module_name, e)
         try:
             lib = mod.register
             libraries[module_name] = lib
@@ -869 +869 @@
             raise InvalidTemplateLibrary, "Template library %s does not have a variable named 'register'" % module_name
     return lib
 
+templatetag_searchpath = [ "django" ]
+templatetag_searchpath.extend( settings.INSTALLED_APPS )
+
 def add_to_builtins(module_name):
     builtins.append(get_library(module_name))
 
 add_to_builtins('django.template.defaulttags')
 add_to_builtins('django.template.defaultfilters')
+
+
+

django/template/defaulttags.py

@@ -3 +3 @@
 from django.template import Node, NodeList, Template, Context, resolve_variable
 from django.template import TemplateSyntaxError, VariableDoesNotExist, BLOCK_TAG_START, BLOCK_TAG_END, VARIABLE_TAG_START, VARIABLE_TAG_END
 from django.template import get_library, Library, InvalidTemplateLibrary
+from django.template import templatetag_searchpath
 from django.conf import settings
 import sys
 
@@ -645 +646 @@
     bits = token.contents.split()
     for taglib in bits[1:]:
         # add the library to the parser
-        try:
-            lib = get_library("django.templatetags.%s" % taglib.split('.')[-1])
+
+        lib = None
+        for app in templatetag_searchpath:
+            try:
+                lib = get_library("%s.templatetags.%s" % (app,taglib))
+            except ImportError,e:
+                continue
             parser.add_library(lib)
-        except InvalidTemplateLibrary, e:
-            raise TemplateSyntaxError, "'%s' is not a valid tag library: %s" % (taglib, e)
+            break
+        if not lib:
+            raise InvalidTemplateLibrary, "'%s' is not a valid tag library" % (taglib,)
     return LoadNode()
 load = register.tag(load)