[Zope3-checkins] CVS: Zope3/src/zope/app/publication - zopepublication.py:1.12

R. Sean Bowman sean.bowman@acm.org
Wed, 5 Feb 2003 23:31:24 -0500


Update of /cvs-repository/Zope3/src/zope/app/publication
In directory cvs.zope.org:/tmp/cvs-serv8752/zope/app/publication

Modified Files:
	zopepublication.py 
Log Message:
changed service names to use strings defined in
zope/component/servicenames.py, changed the name of
ErrorReportingService to ErrorReports


=== Zope3/src/zope/app/publication/zopepublication.py 1.11 => 1.12 ===
--- Zope3/src/zope/app/publication/zopepublication.py:1.11	Wed Feb  5 06:41:29 2003
+++ Zope3/src/zope/app/publication/zopepublication.py	Wed Feb  5 23:30:51 2003
@@ -17,6 +17,7 @@
 from zope.component import getService, getView, getDefaultViewName
 from zope.component import queryService, getAdapter
 from zope.component.exceptions import ComponentLookupError
+from zope.component.servicenames import ErrorReports
 from zodb.interfaces import ConflictError
 
 from zope.publisher.publish import mapply
@@ -204,7 +205,7 @@
 
         # Record the error with the ErrorReportingService
         try:
-            errService = queryService(object, 'ErrorReportingService')
+            errService = queryService(object, ErrorReports)
             if errService is not None:
                 errService.raising(exc_info, request)
             # It is important that an error in errService.raising
@@ -222,8 +223,8 @@
 
         except:
             tryToLogException(
-                'Error while reporting an error to the '
-                'ErrorReportingService')
+                'Error while reporting an error to the ' + 
+                ErrorReports)
             get_transaction().abort()
             beginErrorHandlingTransaction(request)