Reraise RuntimeError as well as ConflictError

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@4991 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5Form/Form.py

@@ -72,9 +72,9 @@ def get_value(self, id, **kw):
         kw['here'] = object
         kw['container'] = container
         try :
-          kw['preferences'] = object.getPortalObject().portal_preferences
+            kw['preferences'] = object.getPortalObject().portal_preferences
         except AttributeError :
-          LOG('ERP5Form', 0,
+            LOG('ERP5Form', 0,
               'portal_preferences not put in TALES context (not installed?)')
         # This allows to pass some pointer to the local object
         # through the REQUEST parameter. Not very clean.
@@ -86,8 +86,8 @@ def get_value(self, id, **kw):
             kw['cell'] = kw['REQUEST']
         try:
             value = tales_expr.__of__(self)(**kw)
-        except ConflictError:
-            pass
+        except (ConflictError, RuntimeError):
+            raise
         except:
             # We add this safety exception to make sure we always get
             # something reasonable rather than generate plenty of errors

product/ERP5Form/ListBox.py

@@ -1637,7 +1637,7 @@ onChange="submitAction(this.form,'%s/portal_selections/setReportRoot')">
                           del kw['closed_summary']
                           params = dict(kw)
                           selection.edit(params=params)
-                      except ConflictError:
+                      except (ConflictError, RuntimeError):
                         raise
                       except:
                         LOG('ListBox', 0, 'WARNING: Could not call %s with %s: ' % (repr(attribute_value), repr(params)), error=sys.exc_info())
@@ -1680,7 +1680,7 @@ onChange="submitAction(this.form,'%s/portal_selections/setReportRoot')">
                     except TypeError:
                       attribute_value = attribute_value()
                       attribute_original_value = attribute_value
-                  except ConflictError:
+                  except (ConflictError, RuntimeError):
                     raise
                   except:
                     LOG('ListBox', 0, 'Could not evaluate', error=sys.exc_info())
@@ -1776,10 +1776,9 @@ onChange="submitAction(this.form,'%s/portal_selections/setReportRoot')">
                     # Call the requested method
                     try:
                       object_url = url_method(brain=o, selection=selection)
-                    except ConflictError:
+                    except (ConflictError, RuntimeError):
                       raise
                     except:
-                      # XXX FIXME: except without Error name
                       LOG('ListBox', 0, 
                           'Could not evaluate url_method %s' % \
                               column[1], error=sys.exc_info())
@@ -1796,7 +1795,7 @@ onChange="submitAction(this.form,'%s/portal_selections/setReportRoot')">
                     else:
                       try:
                         object_url = url_method(alias, i, selection_name)
-                      except ConflictError:
+                      except (ConflictError, RuntimeError):
                         raise
                       except:
                         # XXX FIXME: except without Error name
@@ -1878,7 +1877,7 @@ onChange="submitAction(this.form,'%s/portal_selections/setReportRoot')">
                       #params['operator'] = stats[n]
                       #value=value(**params)
                       value=value(selection=selection)
-                    except ConflictError:
+                    except (ConflictError, RuntimeError):
                       raise
                     except:
                       LOG('ListBox', 0, 'WARNING: Could not call %s with %s: ' % (repr(value), repr(params)), error=sys.exc_info())

product/ERP5Form/PDFTemplate.py

@@ -231,7 +231,7 @@ if HAS_ZODB_RESOURCE_HANDLER:
       if callable(obj):
         try:
           obj = obj()
-        except ConflictError:
+        except (ConflictError, RuntimeError):
           raise
         except:
           pass
@@ -262,7 +262,7 @@ else:
       if callable(obj):
         try:
           obj = obj()
-        except ConflictError:
+        except (ConflictError, RuntimeError):
           raise
         except:
           pass