WSGIPublisher: normalize http exception classes

CHANGES.rst

@@ -20,6 +20,13 @@ Bugs Fixed
 - Don't copy items the user is not allowed to view.
   From Products.PloneHotfix20161129.  [maurits]
 
+- Make the WSGIPublisher normalize HTTP exception classes based on name
+  (for example, any exception named NotFound will be converted
+  into `zExceptions.NotFound`). This restores compatibility with
+  similar behavior of the old publisher.
+  [davisagli]
+
+
 Features Added
 ++++++++++++++
 

buildout.cfg

@@ -19,6 +19,7 @@ parts =
     requirements
 sources-dir = develop
 auto-checkout =
+    zExceptions
 
 
 [test]

sources.cfg

@@ -14,7 +14,7 @@ five.globalrequest = git ${remotes:github}/five.globalrequest pushurl=${remotes:
 MultiMapping = git ${remotes:github}/MultiMapping pushurl=${remotes:github_push}/MultiMapping
 Persistence = git ${remotes:github}/Persistence pushurl=${remotes:github_push}/Persistence
 RestrictedPython = git ${remotes:github}/RestrictedPython pushurl=${remotes:github_push}/RestrictedPython
-zExceptions = git ${remotes:github}/zExceptions pushurl=${remotes:github_push}/zExceptions
+zExceptions = git ${remotes:github}/zExceptions pushurl=${remotes:github_push}/zExceptions branch=davisagli-upgradeException
 zope.globalrequest = git ${remotes:github}/zope.globalrequest pushurl=${remotes:github_push}/zope.globalrequest
 
 # Optional dependencies

src/ZPublisher/WSGIPublisher.py

@@ -26,6 +26,7 @@
     HTTPOk,
     HTTPRedirection,
     Unauthorized,
+    upgradeException,
 )
 from ZODB.POSException import ConflictError
 from zope.component import queryMultiAdapter
@@ -169,6 +170,12 @@ def _publish_response(request, response, module_info, _publish=publish):
         with transaction_pubevents(request):
             response = _publish(request, module_info)
     except Exception as exc:
+        # Normalize HTTP exceptions
+        # (For example turn zope.publisher NotFound into zExceptions NotFound)
+        t, v = upgradeException(exc.__class__, None)
+        if t is not exc.__class__:
+            exc = t(str(exc))
+
         if isinstance(exc, HTTPRedirection):
             response._redirect(exc)
         elif isinstance(exc, Unauthorized):