merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -24,6 +24,7 @@ Fixed:
 - removed rlog module (py 2.3 is minimum version now)
 - fixed class "help" listing paging (sf bug 1106329)
 - nicer error looking up values of None (response to sf bug 1108697)
+- added "imapServer.py" script (sf patch 934567)
 - fallback for (list) popups if javascript disabled (sf patch 1101626)
 
 
@@ -100,6 +101,7 @@ Fixed:
 - allow suppression of search_text in indexargs_form (sf bug 1101548)
 - hack to fix some anydbm export problems (sf bug 1081454)
 - ignore AutoReply messages (sf patch 1085051)
+- fix ZRoundup syntax error (sf bug 1122335)
 
 
 2005-01-06 0.7.11
@@ -109,7 +111,7 @@ Fixed:
 - fix permission lookup in query editing
 
 
-2004-10-04 0.7.10
+2005-01-04 0.7.10
 Fixed:
 - reset ID counters if the database is cleared (thanks William)
 - apply IE caching "fix" to automatically serve up all pages expired

frontends/ZRoundup/ZRoundup.py

@@ -14,7 +14,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: ZRoundup.py,v 1.20 2004-11-05 04:42:45 richard Exp $
+# $Id: ZRoundup.py,v 1.20.2.1 2005-02-15 00:27:04 richard Exp $
 #
 ''' ZRoundup module - exposes the roundup web interface to Zope
 
@@ -97,7 +97,7 @@ def getvalue(self, key, default=None):
     def has_key(self, item):
         return self.form.has_key(item)
     def keys(self):
-        return self.form.keys():
+        return self.form.keys()
 
 class ZRoundup(Item, PropertyManager, Implicit, Persistent):
     '''An instance of this class provides an interface between Zope and