[Zope-Checkins] CVS: Zope/lib/python/Zope - __init__.py:1.31.4.1

[Chris McDonough]

Update of /cvs-repository/Zope/lib/python/Zope
In directory cvs.zope.org:/tmp/cvs-serv3114/lib/python/Zope

Modified Files:
      Tag: chrism-install-branch
	__init__.py 
Log Message:
Merge of head into installer-branch.  Sorry.  :-(


=== Zope/lib/python/Zope/__init__.py 1.31 => 1.31.4.1 ===
--- Zope/lib/python/Zope/__init__.py:1.31	Wed Aug 14 18:10:38 2002
+++ Zope/lib/python/Zope/__init__.py	Tue Sep  3 03:43:48 2002
@@ -91,6 +91,7 @@
 import ZODB.POSException, ZPublisher,  ZPublisher
 import ExtensionClass
 from zLOG import LOG, WARNING, INFO, BLATHER, log_time
+from Acquisition import aq_acquire
 conflict_errors = 0
 startup_time = log_time()
 def debug(*args, **kw):
@@ -128,6 +129,13 @@
                 LOG('Conflict traceback', BLATHER, '', error=sys.exc_info())
                 raise ZPublisher.Retry(t, v, traceback)
             if t is ZPublisher.Retry: v.reraise()
+            
+        try:
+            log = aq_acquire(published, '__error_log__', containment=1)
+        except AttributeError:
+            error_log_url = ''
+        else:
+            error_log_url = log.raising((t, v, traceback))
 
         if (getattr(REQUEST.get('RESPONSE', None), '_error_format', '')
             !='text/html'): raise
@@ -159,8 +167,11 @@
         if REQUEST.get('AUTHENTICATED_USER', None) is None:
             REQUEST['AUTHENTICATED_USER']=AccessControl.User.nobody
 
-
-        f(client, REQUEST, t, v, traceback)
+        try:
+            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)
 
     finally: traceback=None