merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -4,6 +4,7 @@ are given with the most recent entry first.
 2004-??-?? 0.8.0b2
 Fixed:
 - note about how to run roundup demo in Windows
+- fix API for templating utils extensions - remove "utils" arg
 
 
 2004-12-08 0.8.0b1

doc/installation.txt

@@ -97,8 +97,9 @@ For The Really Impatient
 
 .. note::
    The ``demo.py`` script is packaged in Roundup's source distribution - 
-   users of the Windows installer, other binary distributions or
-   pre-installed Roundup will need to download the source to use it.
+   users of the Windows installer may use the ``roundup-demo`` program.
+   Users of other binary distributions or pre-installed Roundup will need
+   to download the source to use it.
 
 If you just want to give Roundup a whirl Right Now, then simply run
 ``python demo.py``. This will set up a simple demo tracker on your

roundup/cgi/templating.py

@@ -2219,14 +2219,6 @@ def next(self):
         return Batch(self.client, self._sequence, self._size,
             self.end - self.overlap, 0, self.orphan, self.overlap)
 
-class TemplatingUtil:
-    def __init__(self, utils, callable):
-        self.utils = utils
-        self.callable = callable
-    def __call__(self, *args, **kw):
-        args = (self.utils,)+args
-        return self.callable(*args, **kw)
-
 class TemplatingUtils:
     ''' Utilities for templating
     '''
@@ -2251,6 +2243,6 @@ def __getattr__(self, name):
             raise AttributeError, name
         if not self.client.instance.templating_utils.has_key(name):
             raise AttributeError, name
-        return TemplatingUtil(self, self.client.instance.templating_utils[name])
+        return self.client.instance.templating_utils[name]
 
 # vim: set et sts=4 sw=4 :