[z3-checkins] r36843 - z3/FiveException/trunk

[philikon at codespeak.net]

Author: philikon
Date: Tue Jan 16 19:13:16 2007
New Revision: 36843

Modified:
   z3/FiveException/trunk/monkey.py
Log:
Fix up for Zope 2.9


Modified: z3/FiveException/trunk/monkey.py
==============================================================================
--- z3/FiveException/trunk/monkey.py	(original)
+++ z3/FiveException/trunk/monkey.py	Tue Jan 16 19:13:16 2007
@@ -6,8 +6,8 @@
 from ZODB.POSException import ConflictError
 from zLOG import LOG, INFO, BLATHER
 import ZPublisher
-from Zope.App.startup import RequestContainer, app
-from zope.component import getView, ComponentLookupError
+from Zope2.App.startup import RequestContainer, app
+from zope.component import getMultiAdapter, ComponentLookupError
 
 from Products.FiveException.interfaces import IZope2HandledException
 
@@ -67,7 +67,7 @@
             raise t, v, traceback
         
         try:
-            view = getView(v, 'index.html', REQUEST)
+            view = getMultiAdapter((v, REQUEST), 'index.html')
         except ComponentLookupError:
             raise t, v, traceback
         # XXX utter hack here to fool Five into working. Five should