[Zope-Checkins] CVS: Zope2 - DTMLDocument.py:1.44 DTMLMethod.py:1.64 FindSupport.py:1.24 History.py:1.7 PropertyManager.py:1.38 PropertySheets.py:1.73

shane@digicool.com shane@digicool.com
Fri, 27 Apr 2001 16:28:13 -0400 (EDT)


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

Modified Files:
	DTMLDocument.py DTMLMethod.py FindSupport.py History.py 
	PropertyManager.py PropertySheets.py 
Log Message:
Merged RestrictedPythonBranch!



--- Updated File DTMLDocument.py in package Zope2 --
--- DTMLDocument.py	2001/01/31 21:26:52	1.43
+++ DTMLDocument.py	2001/04/27 20:27:41	1.44
@@ -86,7 +86,6 @@
 
 __version__='$Revision$'[11:-2]
 
-from DocumentTemplate.DT_Util import InstanceDict, TemplateDict
 from ZPublisher.Converters import type_converters
 from Globals import HTML, DTMLFile, MessageDialog
 from OFS.content_types import guess_content_type

--- Updated File DTMLMethod.py in package Zope2 --
--- DTMLMethod.py	2001/04/27 18:07:12	1.63
+++ DTMLMethod.py	2001/04/27 20:27:41	1.64
@@ -100,7 +100,7 @@
 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
 
 _marker = []  # Create a new marker object.
@@ -261,8 +261,8 @@
     # deprecated; use get_size!
     getSize=get_size
 
-    def validate(self, inst, parent, name, value, md):
-        return getSecurityManager().validate(inst, parent, name, value)
+    def read_guard(self, ob):
+        return full_read_guard(ob)
 
     manage_editForm=DTMLFile('dtml/documentEdit', globals())
 

--- Updated File FindSupport.py in package Zope2 --
--- FindSupport.py	2001/01/11 21:08:48	1.23
+++ FindSupport.py	2001/04/27 20:27:41	1.24
@@ -87,13 +87,13 @@
 
 
 import sys, os, string, time, Globals, ExtensionClass
-from DocumentTemplate.DT_Util import Eval, expr_globals
+from DocumentTemplate.DT_Util import Eval
 from AccessControl.Permission import name_trans
 from Globals import DTMLFile
 from DocumentTemplate.DT_Util import InstanceDict, TemplateDict
 from DateTime import DateTime
 from string import find
-from AccessControl import getSecurityManager
+from AccessControl import getSecurityManager, full_read_guard
 
 class FindSupport(ExtensionClass.Base):
     """Find support for Zope Folders"""
@@ -146,7 +146,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'):
@@ -238,7 +238,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'):
@@ -307,8 +307,8 @@
 
 class td(TemplateDict):
 
-    def validate(self, inst, parent, name, value, md):
-        return getSecurityManager().validate(inst, parent, name, value)
+    def read_guard(self, ob):
+        return full_read_guard(ob)
 
 
 def expr_match(ob, ed, c=InstanceDict, r=0):

--- Updated File History.py in package Zope2 --
--- History.py	2001/01/11 21:12:27	1.6
+++ History.py	2001/04/27 20:27:41	1.7
@@ -91,7 +91,7 @@
 from Acquisition import Implicit
 from string import join, split, atoi, strip
 from struct import pack, unpack
-from DocumentTemplate.DT_Util import html_quote
+from cgi import escape
 
 class TemporalParadox(Exception): pass
 
@@ -267,7 +267,7 @@
             "<td><pre>\n%s\n</pre></td>\n"
             "<td><pre>\n%s\n</pre></td>\n"
             "</tr>\n"
-            % (join(r1,'\n'), html_quote(join(r2, '\n'))))
+            % (join(r1,'\n'), escape(join(r2, '\n'))))
 
 def replace(x, xlo, xhi, y, ylo, yhi, r):
 
@@ -289,7 +289,7 @@
             "<td><pre>\n%s\n%s\n</pre></td>\n"
             "</tr>\n"
             % (join(rx1, '\n'), join(ry1, '\n'),
-               html_quote(join(rx2, '\n')), html_quote(join(ry2, '\n'))))
+               escape(join(rx2, '\n')), escape(join(ry2, '\n'))))
 
 def html_diff(s1, s2):
     a=split(s1,'\n')

--- Updated File PropertyManager.py in package Zope2 --
--- PropertyManager.py	2001/03/01 16:06:11	1.37
+++ PropertyManager.py	2001/04/27 20:27:41	1.38
@@ -92,7 +92,6 @@
 from ZPublisher.Converters import type_converters
 from Globals import DTMLFile, MessageDialog
 from string import find,join,lower,split
-from DocumentTemplate import html_quote
 from Acquisition import Implicit, aq_base
 from Globals import Persistent
 from DateTime import DateTime

--- Updated File PropertySheets.py in package Zope2 --
--- PropertySheets.py	2001/04/10 20:36:59	1.72
+++ PropertySheets.py	2001/04/27 20:27:41	1.73
@@ -89,7 +89,6 @@
 import time, string, App.Management, Globals
 from webdav.WriteLockInterface import WriteLockInterface
 from ZPublisher.Converters import type_converters
-from DocumentTemplate.DT_Util import html_quote
 from Globals import DTMLFile, MessageDialog
 from string import find,join,lower,split,rfind
 from Acquisition import Implicit, Explicit