Ticket #12772: django-12772.patch

django/template/__init__.py

@@ -981 +981 @@
     Verifies that the library contains a 'register' attribute, and
     returns that attribute as the representation of the library
     """
-    app_path, taglib = taglib_module.rsplit('.',1)
-    app_module = import_module(app_path)
     try:
         mod = import_module(taglib_module)
     except ImportError, e:
         # If the ImportError is because the taglib submodule does not exist, that's not
         # an error that should be raised. If the submodule exists and raised an ImportError
         # on the attempt to load it, that we want to raise.
-        if not module_has_submodule(app_module, taglib):
-            return None
-        else:
-            raise InvalidTemplateLibrary("ImportError raised loading %s: %s" % (taglib_module, e))
+        if '.' in taglib_module:
+            app_path, taglib = taglib_module.rsplit('.',1)
+            app_module = import_module(app_path)
+            if module_has_submodule(app_module, taglib):
+                raise InvalidTemplateLibrary("ImportError raised loading %s: %s" % (taglib_module, e))
+        return None
     try:
         return mod.register
     except AttributeError:
@@ -1032 +1032 @@
     """
     lib = libraries.get(library_name, None)
     if not lib:
-        templatetags_modules = get_templatetags_modules()
         tried_modules = []
-        for module in templatetags_modules:
-            taglib_module = '%s.%s' % (module, library_name)
-            tried_modules.append(taglib_module)
-            lib = import_library(taglib_module)
-            if lib:
-                libraries[library_name] = lib
-                break
+        # first try the fully qualified module path
+        taglib_module = library_name
+        tried_modules.append(taglib_module)
+        lib = import_library(taglib_module)
+        if lib:
+            libraries[library_name] = lib
+        else: # then search inside installed apps
+            templatetags_modules = get_templatetags_modules()
+            for module in templatetags_modules:
+                taglib_module = '%s.%s' % (module, library_name)
+                tried_modules.append(taglib_module)
+                lib = import_library(taglib_module)
+                if lib:
+                    libraries[library_name] = lib
+                    break
         if not lib:
             raise InvalidTemplateLibrary("Template library %s not found, tried %s" % (library_name, ','.join(tried_modules)))
     return lib