[Zope-Checkins] SVN: Zope/trunk/lib/python/Products/PageTemplates/Expressions.py Use custom Provider expression from Five instead of the Zope 3 one which doesn't do acquisition wrapping.

[Alec Mitchell]

Log message for revision 68672:
  Use custom Provider expression from Five instead of the Zope 3 one which 
doesn't do acquisition wrapping.
  

Changed:
  U   Zope/trunk/lib/python/Products/PageTemplates/Expressions.py

-=-
Modified: Zope/trunk/lib/python/Products/PageTemplates/Expressions.py
===================================================================
--- Zope/trunk/lib/python/Products/PageTemplates/Expressions.py 2006-06-15 
21:46:10 UTC (rev 68671)
+++ Zope/trunk/lib/python/Products/PageTemplates/Expressions.py 2006-06-15 
21:47:12 UTC (rev 68672)
@@ -24,13 +24,13 @@
 from zope.tales.pythonexpr import PythonExpr
 from zope.traversing.interfaces import ITraversable
 from zope.traversing.adapters import traversePathElement
-from zope.contentprovider.tales import TALESProviderExpression
 from zope.proxy import removeAllProxies
 import zope.app.pagetemplate.engine
 
 import OFS.interfaces
 from Acquisition import aq_base
 from zExceptions import NotFound, Unauthorized
+from Products.Five.browser.providerexpression import Z2ProviderExpression
 from Products.PageTemplates import ZRPythonExpr
 from Products.PageTemplates.DeferExpr import LazyExpr
 from Products.PageTemplates.GlobalTranslationService import 
getGlobalTranslationService
@@ -257,7 +257,7 @@
     e.registerType('not', NotExpr)
     e.registerType('defer', DeferExpr)
     e.registerType('lazy', LazyExpr)
-    e.registerType('provider', TALESProviderExpression)
+    e.registerType('provider', Z2ProviderExpression)
     e.registerBaseName('modules', SecureModuleImporter)
     return e
 

_______________________________________________
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins