[Zope3-checkins] CVS: Zope3/lib/python/Zope/Server/HTTP/tests - testPublisherServer.py:1.5

[Jim Fulton]

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

Modified Files:
	testPublisherServer.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/Server/HTTP/tests/testPublisherServer.py 1.4 => 1.5 ===
--- Zope3/lib/python/Zope/Server/HTTP/tests/testPublisherServer.py:1.4	Tue Jun 18 10:47:08 2002
+++ Zope3/lib/python/Zope/Server/HTTP/tests/testPublisherServer.py	Wed Oct 23 12:00:21 2002
@@ -53,12 +53,12 @@
 
 class PublicationWithConflict(DefaultPublication):
 
-    def handleException(self, request, exc_info, retry_allowed=1):
+    def handleException(self, object, request, exc_info, retry_allowed=1):
         if exc_info[0] is Conflict and retry_allowed:
             # This simulates a ZODB retry.
             raise Retry(exc_info)
         else:
-            DefaultPublication.handleException(self, request, exc_info,
+            DefaultPublication.handleException(self, object, request, exc_info,
                                                retry_allowed)