[Zope-Checkins] CVS: Zope2 - ZCatalog.py:1.85.10.1

[shane@digicool.com]

Update of /cvs-repository/Zope2/lib/python/Products/ZCatalog
In directory korak:/tmp/cvs-serv27222/lib/python/Products/ZCatalog

Modified Files:
      Tag: RestrictedPythonBranch
	ZCatalog.py 
Log Message:
Replaced references to VSEval and expr_globals with simple references to the
restricted Eval class in DT_Util.



--- Updated File ZCatalog.py in package Zope2 --
--- ZCatalog.py	2001/03/21 22:49:12	1.85
+++ ZCatalog.py	2001/04/25 20:26:37	1.85.10.1
@@ -95,7 +95,7 @@
 from Acquisition import Implicit
 from Persistence import Persistent
 from DocumentTemplate.DT_Util import InstanceDict, TemplateDict
-from DocumentTemplate.DT_Util import Eval, expr_globals
+from DocumentTemplate.DT_Util import Eval
 from AccessControl.Permission import name_trans
 from Catalog import Catalog, orify, CatalogError
 from SearchIndex import UnIndex, UnTextIndex
@@ -602,7 +602,7 @@
             if obj_expr:
                 # Setup expr machinations
                 md=td()
-                obj_expr=(Eval(obj_expr, expr_globals), md, md._push, md._pop)
+                obj_expr=(Eval(obj_expr), md, md._push, md._pop)
 
         base=obj
         if hasattr(obj, 'aq_base'):