[Zope3-checkins] CVS: Zope3/lib/python/Zope/Publisher - DefaultPublication.py:1.4 IPublication.py:1.5 Publish.py:1.5

[Jim Fulton]

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

Modified Files:
	DefaultPublication.py IPublication.py Publish.py 
Log Message:
Merging in the work done by Naveen and Rakesh on the
ErrorReportingService-branch branch.

There is now an error reporting service that works like the Zope 2.6
site error log. Yay!


=== Zope3/lib/python/Zope/Publisher/DefaultPublication.py 1.3 => 1.4 ===
--- Zope3/lib/python/Zope/Publisher/DefaultPublication.py:1.3	Tue Jun 18 10:47:06 2002
+++ Zope3/lib/python/Zope/Publisher/DefaultPublication.py	Wed Oct 23 12:00:20 2002
@@ -66,7 +66,7 @@
     def afterCall(self, request):
         pass
 
-    def handleException(self, request, exc_info, retry_allowed=1):
+    def handleException(self, object, request, exc_info, retry_allowed=1):
         # Let the response handle it as best it can.
         request.response.handleException(exc_info)
 


=== Zope3/lib/python/Zope/Publisher/IPublication.py 1.4 => 1.5 ===
--- Zope3/lib/python/Zope/Publisher/IPublication.py:1.4	Sun Jul 14 08:24:16 2002
+++ Zope3/lib/python/Zope/Publisher/IPublication.py	Wed Oct 23 12:00:20 2002
@@ -64,7 +64,7 @@
         """Post-callObject hook (if it was successful).
         """
 
-    def handleException(request, exc_info, retry_allowed=1):
+    def handleException(object, request, exc_info, retry_allowed=1):
         """Handle an exception
         
         Either:


=== Zope3/lib/python/Zope/Publisher/Publish.py 1.4 => 1.5 ===
--- Zope3/lib/python/Zope/Publisher/Publish.py:1.4	Tue Jun 18 10:47:06 2002
+++ Zope3/lib/python/Zope/Publisher/Publish.py	Wed Oct 23 12:00:20 2002
@@ -28,6 +28,7 @@
             publication = request.publication
             try:
                 try:
+                    object = None
                     try:
                         request.processInputs()
                         publication.beforeTraversal(request)
@@ -44,7 +45,8 @@
                         publication.afterCall(request)
 
                     except:
-                        publication.handleException(request, sys.exc_info(), 1)
+                        publication.handleException(object, request, sys.exc_info(), 1)
+                    
                         if not handle_errors:
                             raise
                     
@@ -60,7 +62,7 @@
                         # Output the original exception.
                         publication = request.publication
                         publication.handleException(
-                            request, retryException.getOriginalException(), 0)
+                            object, request, retryException.getOriginalException(), 0)
                         break
                     else:
                         raise