[Zope-Checkins] SVN: Zope/branches/2.10/lib/python/Products/ Backport provider expression fix (-r68672) from trunk.

[Alec Mitchell]

Log message for revision 68757:
  Backport provider expression fix (-r68672) from trunk.
  

Changed:
  _U  Zope/branches/2.10/lib/python/Products/
  U   Zope/branches/2.10/lib/python/Products/PageTemplates/Expressions.py

-=-

Property changes on: Zope/branches/2.10/lib/python/Products
___________________________________________________________________
Name: svn:externals
   - Five    -r 68410 svn://svn.zope.org/repos/main/Products.Five/trunk

   + Five    -r 68672 svn://svn.zope.org/repos/main/Products.Five/trunk



Modified: Zope/branches/2.10/lib/python/Products/PageTemplates/Expressions.py
===================================================================
--- Zope/branches/2.10/lib/python/Products/PageTemplates/Expressions.py	2006-06-19 15:44:03 UTC (rev 68756)
+++ Zope/branches/2.10/lib/python/Products/PageTemplates/Expressions.py	2006-06-19 17:09:48 UTC (rev 68757)
@@ -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