Ticket #288: user_taglibs.patch

django/core/defaulttags.py

@@ -225 +225 @@
         self.taglib = taglib
 
     def load_taglib(taglib):
+        tag_dirs = ()
+        try:
+            from django.conf.settings import TEMPLATETAG_DIRS
+            tag_dirs = TEMPLATETAG_DIRS
+        except ImportError:
+            pass
+
+        # save sys.path for later restoration
+        import sys
+        syspath = sys.path[:]
+
+        # set the first element of sys.path to each entry of
+        # TEMPLATETAG_DIRS, then try the import.
+        sys.path.insert(0, '')
+        for tag_dir in tag_dirs:
+            sys.path[0] = tag_dir
+            try:
+                mod = __import__("%s" % taglib.split('.')[-1], '', '', [''])
+            except ImportError:
+                continue
+            # restore sys.path
+            reload(mod)
+            sys.path = syspath[:]
+            return mod
+        # restore sys.path
+        sys.path = syspath[:]
+
+        # one more try without path manipulation
         mod = __import__("django.templatetags.%s" % taglib.split('.')[-1], '', '', [''])
         reload(mod)
         return mod
+
     load_taglib = staticmethod(load_taglib)
 
     def render(self, context):