|
1 | | -#$Id: actions.py,v 1.15 2004-03-26 00:44:11 richard Exp $ |
| 1 | +#$Id: actions.py,v 1.16 2004-03-26 00:46:33 richard Exp $ |
2 | 2 |
|
3 | 3 | import re, cgi, StringIO, urllib, Cookie, time, random |
4 | 4 |
|
5 | | -from roundup import hyperdb, token, date, password, rcsv |
| 5 | +from roundup import hyperdb, token, date, password, rcsv, exceptions |
6 | 6 | from roundup.i18n import _ |
7 | 7 | from roundup.cgi import templating |
8 | 8 | from roundup.cgi.exceptions import Redirect, Unauthorised, SeriousError |
@@ -471,7 +471,7 @@ def handle(self): |
471 | 471 | # handle the props |
472 | 472 | try: |
473 | 473 | message = self._editnodes(props, links) |
474 | | - except (ValueError, KeyError, IndexError), message: |
| 474 | + except (ValueError, KeyError, IndexError, exceptions.Reject), message: |
475 | 475 | self.client.error_message.append(_('Apply Error: ') + str(message)) |
476 | 476 | return |
477 | 477 |
|
@@ -511,7 +511,7 @@ def handle(self): |
511 | 511 | # when it hits the None element, it'll set self.nodeid |
512 | 512 | messages = self._editnodes(props, links) |
513 | 513 |
|
514 | | - except (ValueError, KeyError, IndexError), message: |
| 514 | + except (ValueError, KeyError, IndexError, exceptions.Reject), message: |
515 | 515 | # these errors might just be indicative of user dumbness |
516 | 516 | self.client.error_message.append(_('Error: ') + str(message)) |
517 | 517 | return |
|
0 commit comments