[Zope-Checkins] SVN: Zope/branches/2.11/lib/python/Zope2/App/startup.py Good catch Sidnei, damn you unexpected merge

[Matthew Wilkes]

Log message for revision 92794:
  Good catch Sidnei, damn you unexpected merge

Changed:
  U   Zope/branches/2.11/lib/python/Zope2/App/startup.py

-=-
Modified: Zope/branches/2.11/lib/python/Zope2/App/startup.py
===================================================================
--- Zope/branches/2.11/lib/python/Zope2/App/startup.py	2008-11-05 13:08:33 UTC (rev 92793)
+++ Zope/branches/2.11/lib/python/Zope2/App/startup.py	2008-11-05 13:17:50 UTC (rev 92794)
@@ -249,15 +249,7 @@
                 REQUEST['AUTHENTICATED_USER'] = AccessControl.User.nobody
 
             try:
-                result = f(client, REQUEST, t, v, 
-                           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
+                f(client, REQUEST, t, v, traceback, error_log_url=error_log_url)
             except TypeError:
                 # Pre 2.6 call signature
                 f(client, REQUEST, t, v, traceback)