Ticket #2539: template_04.diff

django/templatetags/__init__.py

@@ -2 +2 @@
-
-for a in settings.INSTALLED_APPS:
-    try:
+        path = __import__(a[:a.rindex('.')], '', '', ['']).__path__
+        for i in path:
+            if not i in __path__:
+                __path__.append(i)
-        __path__.extend(__import__(a + '.templatetags', {}, {}, ['']).__path__)
-    except ImportError:
-        pass

django/template/__init__.py

@@ -63 +63 @@
-from django.utils.text import smart_split
-from django.utils.encoding import smart_unicode, force_unicode
-from django.utils.translation import ugettext as _
+from django.utils.datastructures import SortedDict
-
-__all__ = ('Template', 'Context', 'RequestContext', 'compile_string')
-
@@ -261 +262 @@
-        self.tokens = tokens
-        self.tags = {}
-        self.filters = {}
+        self.libs = {}
-        for lib in builtins:
-            self.add_library(lib)
-
@@ -289 +291 @@
-                # execute callback function for this tag and append resulting node
-                self.enter_command(command, token)
-                try:
-tags[command]
+get_tags(command)
-                except KeyError:
-                    self.invalid_block_tag(token, command)
-                try:
@@ -355 +357 @@
-    def add_library(self, lib):
-        self.tags.update(lib.tags)
-        self.filters.update(lib.filters)
+        #save index of lib
+        if hasattr(lib, 'appname'):
+            d = self.libs.setdefault(lib.taglibname, SortedDict({}))
+            d[lib.appname] = {'tags':lib.tags, 'filters': lib.filters}
-
+    def get_tags(self, tag):
+        v = tag.split('.')
+        if len(v) == 3:
+            appname, taglibname, command = v
+            return self.libs[taglibname][appname]['tags'][command]
+        elif len(v) == 2:
+            taglibname, command = v
+            return self.libs[taglibname].values()[0]['tags'][command]
+        else:
+            return self.tags[tag]
+
+    def get_filters(self, filter_name):
+        v = filter_name.split('.')
+        if len(v) == 3:
+            appname, taglibname, command = v
+            return self.libs[taglibname][appname]['filters'][command]
+        elif len(v) == 2:
+            taglibname, command = v
+            return self.libs[taglibname].values()[0]['filters'][command]
+        else:
+            return self.filters[filter_name]
+
-    def compile_filter(self, token):
-        "Convenient wrapper for FilterExpression"
-        return FilterExpression(token, self)
-
-    def find_filter(self, filter_name):
-
-
-
+
+
+
+
+
-            raise TemplateSyntaxError, "Invalid filter: '%s'" % filter_name
-
-class DebugParser(Parser):
@@ -503 +533 @@
-^"(?P<constant>%(str)s)"|
-^(?P<var>[%(var_chars)s]+)|
- (?:%(filter_sep)s
-\w
+[\w.]
-         (?:%(arg_sep)s
-             (?:
-              %(i18n_open)s"(?P<i18n_arg>%(str)s)"%(i18n_close)s|
@@ -914 +944 @@
-            return func
-        return dec
-
+import os.path
-def get_library(module_name):
-    lib = libraries.get(module_name, None)
-    if not lib:
-        try:
-            mod = __import__(module_name, {}, {}, [''])
+            #get the appname and tag module name from the __file__
+            v = mod.__file__.replace('\\', '/').split('/')
+            if v[-2] == 'templatetags':
+                appname, taglibname = v[-3], os.path.splitext(v[-1])[0]
+            else:
+                appname, taglibname = None, None
-        except ImportError, e:
+            import traceback
+            traceback.print_exc()
-            raise InvalidTemplateLibrary, "Could not load template library from %s, %s" % (module_name, e)
-        try:
-            lib = mod.register
+
+            # assign appname and taglibname to lib
+            lib.appname = appname
+            lib.taglibname = taglibname
-            libraries[module_name] = lib
-        except AttributeError:
-            raise InvalidTemplateLibrary, "Template library %s does not have a variable named 'register'" % module_name

django/template/defaulttags.py

@@ -795 +795 @@
-    for taglib in bits[1:]:
-        # add the library to the parser
-        try:
-
+
+
+
+
-            parser.add_library(lib)
-        except InvalidTemplateLibrary, e:
+            import traceback
+            traceback.print_exc()
-            raise TemplateSyntaxError, "'%s' is not a valid tag library: %s" % (taglib, e)
-    return LoadNode()
-load = register.tag(load)