changeset 3007:1055ec0dc868 maint-0.8

merge from HEAD
author Richard Jones <richard@users.sourceforge.net>
date Tue, 14 Dec 2004 23:07:51 +0000
parents cf433fe67f8b
children 240a24f1e69f
files CHANGES.txt doc/installation.txt roundup/cgi/templating.py
diffstat 3 files changed, 5 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/CHANGES.txt	Tue Dec 14 23:05:27 2004 +0000
+++ b/CHANGES.txt	Tue Dec 14 23:07:51 2004 +0000
@@ -4,6 +4,7 @@
 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
--- a/doc/installation.txt	Tue Dec 14 23:05:27 2004 +0000
+++ b/doc/installation.txt	Tue Dec 14 23:07:51 2004 +0000
@@ -97,8 +97,9 @@
 
 .. 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
--- a/roundup/cgi/templating.py	Tue Dec 14 23:05:27 2004 +0000
+++ b/roundup/cgi/templating.py	Tue Dec 14 23:07:51 2004 +0000
@@ -2219,14 +2219,6 @@
         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 @@
             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 :

Roundup Issue Tracker: http://roundup-tracker.org/