[Zope3-checkins] SVN: Zope3/branches/roger-bostonskin/src/zope/contentprovider/ Bugfix zope.contentprovider

[Roger Ineichen]

Log message for revision 38871:
  Bugfix zope.contentprovider
  Use siteinfo for get a trusted sitemanager
  Register TALES expression correct

Changed:
  U   Zope3/branches/roger-bostonskin/src/zope/contentprovider/configure.zcml
  U   Zope3/branches/roger-bostonskin/src/zope/contentprovider/tales.py

-=-
Modified: Zope3/branches/roger-bostonskin/src/zope/contentprovider/configure.zcml
===================================================================
--- Zope3/branches/roger-bostonskin/src/zope/contentprovider/configure.zcml	2005-10-07 11:38:55 UTC (rev 38870)
+++ Zope3/branches/roger-bostonskin/src/zope/contentprovider/configure.zcml	2005-10-07 11:50:26 UTC (rev 38871)
@@ -6,7 +6,7 @@
   <interface interface=".interfaces.ITALESProvidersExpression" />
   <tales:expressiontype
       name="providers"
-      handler=".tales.TALESProviderExpression"
+      handler=".tales.TALESProvidersExpression"
       />
 
   <interface interface=".interfaces.ITALESProviderExpression" />

Modified: Zope3/branches/roger-bostonskin/src/zope/contentprovider/tales.py
===================================================================
--- Zope3/branches/roger-bostonskin/src/zope/contentprovider/tales.py	2005-10-07 11:38:55 UTC (rev 38870)
+++ Zope3/branches/roger-bostonskin/src/zope/contentprovider/tales.py	2005-10-07 11:50:26 UTC (rev 38871)
@@ -18,10 +18,10 @@
 __docformat__ = 'restructuredtext'
 import zope.interface
 import zope.component
-from zope.component.interfaces import ISiteManager
 from zope.tales import expressions
 
 from zope.interface.declarations import providedBy
+from zope.app.component.hooks import siteinfo
 from zope.contentprovider import interfaces, manager
 
 
@@ -63,7 +63,7 @@
         iface = interfaces.IContentProviderManager
         objs = (context, request, view)
         # we have to use the lookup method because region is an interface!
-        lookup = ISiteManager(context).adapters.lookup
+        lookup = siteinfo.sm.adapters.lookup
         cpManagerClass = lookup(map(providedBy, objs)+[region], iface, name='')
         if cpManagerClass is not None:
             cpManager = cpManagerClass(context, request, view, region)
@@ -114,7 +114,7 @@
         iface = interfaces.IContentProviderManager
         objs = (context, request, view)
         # we have to use the lookup method because region is an interface!
-        lookup = ISiteManager(context).adapters.lookup
+        lookup = siteinfo.sm.adapters.lookup
         cpManagerClass = lookup(map(providedBy, objs)+[region], iface, name='')
         if cpManagerClass is not None:
             cpManager = cpManagerClass(context, request, view, region)