Fix override of TemplatingUtils in instance.py.

Thanks to Cheer Xiao for the patch.

Author: schlatterbeck

CHANGES.txt

@@ -73,6 +73,8 @@ Fixed:
   Cheer Xiao for the patches.
 - Fix wrong execute permissions on some files, thanks to Cheer Xiao for
   the patch.
+- Fix override of TemplatingUtils in instance.py, thanks to Cheer Xiao
+  for the patch.
 
 
 2011-07-15: 1.4.19

roundup/cgi/templating.py

@@ -249,10 +249,9 @@ def context(client, template=None, classname=None, request=None):
       The current database, used to access arbitrary database items.
 
     *utils*
-      This is a special class that has its base in the TemplatingUtils
-      class in this file. If the tracker interfaces module defines a
-      TemplatingUtils class then it is mixed in, overriding the methods
-      in the base class.
+      This is an instance of client.instance.TemplatingUtils, which is
+      optionally defined in the tracker interfaces module and defaults to
+      TemplatingUtils class in this file.
 
     *templates*
       Access to all the tracker templates by name.
@@ -272,12 +271,6 @@ class in this file. If the tracker interfaces module defines a
       methods ``gettext`` and ``ngettext``.
 
     """
-    # construct the TemplatingUtils class
-    utils = TemplatingUtils
-    if (hasattr(client.instance, 'interfaces') and
-            hasattr(client.instance.interfaces, 'TemplatingUtils')):
-        class utils(client.instance.interfaces.TemplatingUtils, utils):
-            pass
 
     # if template, classname and/or request are not passed explicitely,
     # compute form client
@@ -296,7 +289,7 @@ class utils(client.instance.interfaces.TemplatingUtils, utils):
          'db': HTMLDatabase(client),
          'config': client.instance.config,
          'tracker': client.instance,
-         'utils': utils(client),
+         'utils': client.instance.TemplatingUtils(client),
          'templates': client.instance.templates,
          'template': template,
          'true': 1,

roundup/instance.py

@@ -173,6 +173,7 @@ def load_interfaces(self):
             self._load_python('interfaces.py', vars)
         self.Client = vars.get('Client', client.Client)
         self.MailGW = vars.get('MailGW', mailgw.MailGW)
+        self.TemplatingUtils = vars.get('TemplatingUtils', templating.TemplatingUtils)
 
     def get_extensions(self, dirname):
         """Load python extensions