ERP5Type/patches/WSGIPublisher: Ensure transaction abort.

Transaction must be aborted even if the state is getting so bad that the
exception is being re-raised. Leaving an open-ended transaction is never
acceptable.

product/ERP5Type/patches/WSGIPublisher.py

@@ -280,53 +280,54 @@ def transaction_pubevents(request, response, err_hook, tm=transaction.manager):
         exc_info = (exc_type, exc, sys.exc_info()[2])
 
         try:
-            # Raise exception from app if handle-errors is False
-            # (set by zope.testbrowser in some cases)
-            if request.environ.get('x-wsgiorg.throw_errors', False):
-                reraise(*exc_info)
-
-            if err_hook:
-                parents = request.get('PARENTS')
-                if parents:
-                    parents = parents[0]
-                retry = False
-                try:
+            try:
+                # Raise exception from app if handle-errors is False
+                # (set by zope.testbrowser in some cases)
+                if request.environ.get('x-wsgiorg.throw_errors', False):
+                    reraise(*exc_info)
+
+                if err_hook:
+                    parents = request.get('PARENTS')
+                    if parents:
+                        parents = parents[0]
+                    retry = False
                     try:
-                        r = err_hook(parents, request, *exc_info)
-                        assert r is response
-                        exc_view_created = True
-                    except Retry:
-                        if request.supports_retry():
-                            retry = True
-                        else:
-                            r = err_hook(parents, request, *sys.exc_info())
+                        try:
+                            r = err_hook(parents, request, *exc_info)
                             assert r is response
                             exc_view_created = True
-                except (Redirect, Unauthorized):
-                    response.exception()
-                    exc_view_created = True
-                except BaseException as e:
-                    if e is not exc:
-                        raise
-                    exc_view_created = False
-            else:
-                # Handle exception view
-                exc_view_created = _exc_view_created_response(
-                    exc, request, response)
-
-                if isinstance(exc, Unauthorized):
-                    # _unauthorized modifies the response in-place. If this hook
-                    # is used, an exception view for Unauthorized has to merge
-                    # the state of the response and the exception instance.
-                    exc.setRealm(response.realm)
-                    response._unauthorized()
-                    response.setStatus(exc.getStatus())
-
-                retry = isinstance(exc, TransientError) and request.supports_retry()
-
-            notify(pubevents.PubBeforeAbort(request, exc_info, retry))
-            tm.abort()
-            notify(pubevents.PubFailure(request, exc_info, retry))
+                        except Retry:
+                            if request.supports_retry():
+                                retry = True
+                            else:
+                                r = err_hook(parents, request, *sys.exc_info())
+                                assert r is response
+                                exc_view_created = True
+                    except (Redirect, Unauthorized):
+                        response.exception()
+                        exc_view_created = True
+                    except BaseException as e:
+                        if e is not exc:
+                            raise
+                        exc_view_created = False
+                else:
+                    # Handle exception view
+                    exc_view_created = _exc_view_created_response(
+                        exc, request, response)
+
+                    if isinstance(exc, Unauthorized):
+                        # _unauthorized modifies the response in-place. If this hook
+                        # is used, an exception view for Unauthorized has to merge
+                        # the state of the response and the exception instance.
+                        exc.setRealm(response.realm)
+                        response._unauthorized()
+                        response.setStatus(exc.getStatus())
+
+                    retry = isinstance(exc, TransientError) and request.supports_retry()
+            finally:
+                notify(pubevents.PubBeforeAbort(request, exc_info, retry))
+                tm.abort()
+                notify(pubevents.PubFailure(request, exc_info, retry))
 
             if retry:
                 reraise(*exc_info)