[Zope-Checkins] CVS: Zope2 - DTMLMethod.py:1.62.2.2 FindSupport.py:1.23.46.3

[shane@digicool.com]

Update of /cvs-repository/Zope2/lib/python/OFS
In directory korak:/tmp/cvs-serv14600/lib/python/OFS

Modified Files:
      Tag: RestrictedPythonBranch
	DTMLMethod.py FindSupport.py 
Log Message:
Moved ZopeGuards.py to AccessControl.  Now full_read_guard, a highly
useful utility, is easily found.



--- Updated File DTMLMethod.py in package Zope2 --
--- DTMLMethod.py	2001/04/26 22:25:08	1.62.2.1
+++ DTMLMethod.py	2001/04/26 23:12:19	1.62.2.2
@@ -100,9 +100,8 @@
 from DateTime.DateTime import DateTime
 from urllib import quote
 import  Globals, sys, Acquisition
-from AccessControl import getSecurityManager
+from AccessControl import getSecurityManager, full_read_guard
 from Cache import Cacheable
-from RestrictedPython.ZopeGuards import full_read_guard
 
 _marker = []  # Create a new marker object.
 

--- Updated File FindSupport.py in package Zope2 --
--- FindSupport.py	2001/04/26 22:25:08	1.23.46.2
+++ FindSupport.py	2001/04/26 23:12:19	1.23.46.3
@@ -93,8 +93,7 @@
 from DocumentTemplate.DT_Util import InstanceDict, TemplateDict
 from DateTime import DateTime
 from string import find
-from AccessControl import getSecurityManager
-from RestrictedPython.ZopeGuards import full_read_guard
+from AccessControl import getSecurityManager, full_read_guard
 
 class FindSupport(ExtensionClass.Base):
     """Find support for Zope Folders"""