Good catch Sidnei, damn you unexpected merge

76f9dc1d · Matthew Wilkes · 88c83fc6 · 76f9dc1d
Commit 76f9dc1d authored Nov 05, 2008 by Matthew Wilkes
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 9 deletions

lib/python/Zope2/App/startup.py lib/python/Zope2/App/startup.py +1 -9

No files found.
--- a/lib/python/Zope2/App/startup.py
+++ b/lib/python/Zope2/App/startup.py
@@ -249,15 +249,7 @@ class ZPublisherExceptionHook:
                REQUEST['AUTHENTICATED_USER'] = AccessControl.User.nobody
            try:
-                result = f(client, REQUEST, t, v, 
+                f(client, REQUEST, t, v, traceback, error_log_url=error_log_url)
-                           traceback, 
-                           error_log_url=error_log_url)
-                if result is not None:
-                    t, v, traceback = result
-                    response = REQUEST.RESPONSE
-                    response.setStatus(t)
-                    response.setBody(v)
-                    return response
            except TypeError:
                # Pre 2.6 call signature
                f(client, REQUEST, t, v, traceback)