[Zope-Checkins] CVS: Zope/lib/python/Zope/App - startup.py:1.1.6.4

[Shane Hathaway]

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

Modified Files:
      Tag: Zope-2_6-branch
	startup.py 
Log Message:
Merged correct error reporting from the head.

An unrelated "AttributeError: __error_log__" was being reported
instead of the real error condition.


=== Zope/lib/python/Zope/App/startup.py 1.1.6.3 => 1.1.6.4 ===
--- Zope/lib/python/Zope/App/startup.py:1.1.6.3	Tue Jun 24 16:18:31 2003
+++ Zope/lib/python/Zope/App/startup.py	Wed Sep 17 09:49:16 2003
@@ -166,7 +166,8 @@
             error_log_url = log.raising((t, v, traceback))
 
         if (getattr(REQUEST.get('RESPONSE', None), '_error_format', '')
-            !='text/html'): raise
+            !='text/html'):
+            raise t, v, traceback
 
         if (published is None or published is app or
             type(published) is ListType):
@@ -181,7 +182,8 @@
             f=getattr(published, 'raise_standardErrorMessage', None)
             if f is None:
                 published=getattr(published, 'aq_parent', None)
-                if published is None: raise
+                if published is None:
+                    raise t, v, traceback
             else:
                 break
 
@@ -190,7 +192,8 @@
             if getattr(client, 'standard_error_message', None) is not None:
                 break
             client=getattr(client, 'aq_parent', None)
-            if client is None: raise
+            if client is None:
+                raise t, v, traceback
 
         if REQUEST.get('AUTHENTICATED_USER', None) is None:
             REQUEST['AUTHENTICATED_USER']=AccessControl.User.nobody