Added the exception hook.

lib/python/Zope/__init__.py

+##############################################################################
+# 
+# Zope Public License (ZPL) Version 1.0
+# -------------------------------------
+# 
+# Copyright (c) Digital Creations.  All rights reserved.
+# 
+# This license has been certified as Open Source(tm).
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+# 
+# 1. Redistributions in source code must retain the above copyright
+#    notice, this list of conditions, and the following disclaimer.
+# 
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions, and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 
+# 3. Digital Creations requests that attribution be given to Zope
+#    in any manner possible. Zope includes a "Powered by Zope"
+#    button that is installed by default. While it is not a license
+#    violation to remove this button, it is requested that the
+#    attribution remain. A significant investment has been put
+#    into Zope, and this effort will continue if the Zope community
+#    continues to grow. This is one way to assure that growth.
+# 
+# 4. All advertising materials and documentation mentioning
+#    features derived from or use of this software must display
+#    the following acknowledgement:
+# 
+#      "This product includes software developed by Digital Creations
+#      for use in the Z Object Publishing Environment
+#      (http://www.zope.org/)."
+# 
+#    In the event that the product being advertised includes an
+#    intact Zope distribution (with copyright and license included)
+#    then this clause is waived.
+# 
+# 5. Names associated with Zope or Digital Creations must not be used to
+#    endorse or promote products derived from this software without
+#    prior written permission from Digital Creations.
+# 
+# 6. Modified redistributions of any form whatsoever must retain
+#    the following acknowledgment:
+# 
+#      "This product includes software developed by Digital Creations
+#      for use in the Z Object Publishing Environment
+#      (http://www.zope.org/)."
+# 
+#    Intact (re-)distributions of any official Zope release do not
+#    require an external acknowledgement.
+# 
+# 7. Modifications are encouraged but must be packaged separately as
+#    patches to official Zope releases.  Distributions that do not
+#    clearly separate the patches from the original work must be clearly
+#    labeled as unofficial distributions.  Modifications which do not
+#    carry the name Zope may be packaged in any form, as long as they
+#    conform to all of the clauses above.
+# 
+# 
+# Disclaimer
+# 
+#   THIS SOFTWARE IS PROVIDED BY DIGITAL CREATIONS ``AS IS'' AND ANY
+#   EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+#   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+#   PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL DIGITAL CREATIONS OR ITS
+#   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+#   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+#   USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+#   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+#   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+#   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+#   SUCH DAMAGE.
+# 
+# 
+# This software consists of contributions made by Digital Creations and
+# many individuals on behalf of Digital Creations.  Specific
+# attributions are listed in the accompanying credits file.
+# 
+##############################################################################
 """Initialize the Zope Package and provide a published module
 """
 
@@ -49,3 +133,60 @@ del c
 
 # This is sneaky, but we don't want to play with Main:
 sys.modules['Main']=sys.modules['Zope']
+
+import ZODB.POSException, ZPublisher, string, ZPublisher, AccessControl.User
+import ExtensionClass
+
+def test(*args, **kw):
+    return apply(ZPublisher.test,('Zope',)+args, kw)
+
+class RequestContainer(ExtensionClass.Base):
+        def __init__(self,r): self.REQUEST=r
+
+def zpublisher_exception_hook(
+    published, REQUEST, t, v, traceback,
+    # static
+    StringType=type(''),
+    lower=string.lower,
+    ConflictError=ZODB.POSException.ConflictError,
+    ):
+    try:
+        if type(t) is StringType and lower(t) in ('unauthorized', 'redirect'):
+            raise
+        if t is ConflictError:
+            # now what
+            raise ZPublisher.Retry
+
+        if (getattr(REQUEST.get('RESPONSE', None), '_error_format', '')
+            !='text/html'): raise
+
+        if published is None or published is app:
+            # At least get the top-lebel object
+            published=app.__bobo_traverse__(REQUEST).__of__(
+                RequestContainer(REQUEST))
+
+        get_transaction().begin() # Just to be sure.
+
+        published=getattr(published, 'im_self', published)
+        while 1:
+            f=getattr(published, 'raise_standardErrorMessage', None)
+            if f is None:
+                published=getattr(published, 'aq_parent', None)
+                if published is None: raise
+            else:
+                break
+
+        client=published
+        while 1:
+            if getattr(client, 'standard_error_message', None) is not None:
+                break
+            client=getattr(client, 'aq_parent', None)
+            if client is None: raise
+
+        if REQUEST.get('AUTHENTICATED_USER', None) is None:
+            REQUEST['AUTHENTICATED_USER']=AccessControl.User.nobody
+
+
+        f(client, REQUEST, t, v, traceback)
+        
+    finally: traceback=None