Ticket #6587: new_template_lib_loader_5.diff

django/template/__init__.py

@@ -59 +59 @@
 from django.utils.translation import ugettext as _
 from django.utils.safestring import SafeData, EscapeData, mark_safe, mark_for_escaping
 from django.utils.html import escape
+from django.templatetags import get_templatetags_modules
 
 __all__ = ('Template', 'Context', 'RequestContext', 'compile_string')
 
@@ -910 +911 @@
             return func
         return dec
 
-def get_library(module_name):
-    lib = libraries.get(module_name, None)
+def get_library(library_name, extra_modules=[]):
+    lib = libraries.get(library_name, None)
     if not lib:
-        try:
-            mod = __import__(module_name, {}, {}, [''])
-        except ImportError, e:
-            raise InvalidTemplateLibrary("Could not load template library from %s, %s" % (module_name, e))
-        try:
-            lib = mod.register
-            libraries[module_name] = lib
-        except AttributeError:
-            raise InvalidTemplateLibrary("Template library %s does not have a variable named 'register'" % module_name)
+        templatetags_modules = get_templatetags_modules()
+        search_modules = extra_modules + templatetags_modules
+        for m in search_modules: 
+            app_label = m.split('.')[-1]
+            "Allow both library_name and app_label.library_name"
+            try:
+                app, library = library_name.split('.')
+            except:
+                app, library = ('', library_name)
+            if not app or app == app_label:
+                try:
+                    module_name = '%s.%s' % (m, library)
+                    mod = __import__(module_name, {}, {}, [''])
+                except ImportError:
+                    continue
+            else:
+                continue
+            try:
+                lib = mod.register
+                libraries[library_name] = lib
+            except AttributeError:
+                raise InvalidTemplateLibrary("Template library %s does not have a variable named 'register'" % module_name)
+        if not lib:
+            raise InvalidTemplateLibrary("Template library %s not found, tried %s" % (library_name, str(search_modules))) 
     return lib
 
-def add_to_builtins(module_name):
-    builtins.append(get_library(module_name))
+def add_to_builtins(module_name, library_name):
+    builtins.append(get_library(library_name, extra_modules=[module_name]))
 
-add_to_builtins('django.template.defaulttags')
-add_to_builtins('django.template.defaultfilters')
+add_to_builtins('django.template', 'defaulttags')
+add_to_builtins('django.template', 'defaultfilters')

django/template/defaulttags.py

@@ -850 +850 @@
     for taglib in bits[1:]:
         # add the library to the parser
         try:
-            lib = get_library("django.templatetags.%s" % taglib)
+            lib = get_library(taglib)
             parser.add_library(lib)
         except InvalidTemplateLibrary, e:
             raise TemplateSyntaxError("'%s' is not a valid tag library: %s" %

django/template/loader.py

@@ -115 +115 @@
     # If we get here, none of the templates could be loaded
     raise TemplateDoesNotExist, ', '.join(template_name_list)
 
-add_to_builtins('django.template.loader_tags')
+add_to_builtins('django.template', 'loader_tags')

django/templatetags/__init__.py

@@ -1 +1 @@
 from django.conf import settings
+import os
 
-for a in settings.INSTALLED_APPS:
-    try:
-        __path__.extend(__import__(a + '.templatetags', {}, {}, ['']).__path__)
-    except ImportError:
-        pass
+templatetags_modules = [] 
+
+def get_templatetags_modules():
+    if not templatetags_modules:
+        for a in ['django'] + list(settings.INSTALLED_APPS):
+            try:
+                name = a + '.templatetags'
+                mod = __import__(name, {}, {}, [''])
+                templatetags_modules.append(name)
+            except ImportError:
+                pass
+    return templatetags_modules 

tests/regressiontests/templates/tests.py

@@ -45 +45 @@
 
 register.tag("echo", do_echo)
 
-template.libraries['django.templatetags.testtags'] = register
+template.libraries['testtags'] = register
 
 #####################################
 # Helper objects for template tests #