merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -27,6 +27,7 @@ Fixed:
 - refactored hyperdb.rawToHyperdb, allowing a number of improvements
   (thanks Ralf Schlatterbeck)
 - don't try to set a timeout for IMAPS (thanks Paul Jimenez)
+- present Reject exception messages to web users (sf bug 1237685)
 
 
 2005-05-02 0.8.3

roundup/cgi/client.py

@@ -1,4 +1,4 @@
-# $Id: client.py,v 1.211.2.2 2005-06-24 05:28:24 richard Exp $
+# $Id: client.py,v 1.211.2.3 2005-07-18 01:33:49 richard Exp $
 
 """WWW request handler (also used in the stand-alone server).
 """
@@ -736,6 +736,9 @@ def handle_action(self):
 
             Actions may return a page (by default HTML) to return to the
             user, bypassing the usual template rendering.
+
+            We explicitly catch Reject and ValueError exceptions and
+            present their messages to the user.
         '''
         if self.form.has_key(':action'):
             action = self.form[':action'].value.lower()
@@ -754,7 +757,7 @@ def handle_action(self):
             else:
                 return action_klass(self).execute()
 
-        except ValueError, err:
+        except (ValueError, Reject), err:
             self.error_message.append(str(err))
 
     def get_action_class(self, action_name):