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

Casey Duncan casey@zope.com
Fri, 30 Aug 2002 16:21:30 -0400


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

Modified Files:
	__init__.py 
Log Message:
Added an argument to pass error_log_url into raise_standardErrorMessage since logging is now done above it.


=== Zope/lib/python/Zope/__init__.py 1.32 => 1.33 ===
--- Zope/lib/python/Zope/__init__.py:1.32	Fri Aug 30 15:17:08 2002
+++ Zope/lib/python/Zope/__init__.py	Fri Aug 30 16:21:29 2002
@@ -167,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