[Zope-Checkins] SVN: Zope/branches/hannosch-dtml-vs-accesscontrol/src/ Import RestrictedDTML from new location

[Hanno Schlichting]

Log message for revision 112385:
  Import RestrictedDTML from new location
  

Changed:
  U   Zope/branches/hannosch-dtml-vs-accesscontrol/src/OFS/DTMLMethod.py
  U   Zope/branches/hannosch-dtml-vs-accesscontrol/src/OFS/FindSupport.py
  U   Zope/branches/hannosch-dtml-vs-accesscontrol/src/Products/PageTemplates/ZRPythonExpr.py
  U   Zope/branches/hannosch-dtml-vs-accesscontrol/src/Products/PythonScripts/standard.py
  U   Zope/branches/hannosch-dtml-vs-accesscontrol/src/Products/ZCatalog/ZCatalog.py
  U   Zope/branches/hannosch-dtml-vs-accesscontrol/src/Shared/DC/ZRDB/DA.py

-=-
Modified: Zope/branches/hannosch-dtml-vs-accesscontrol/src/OFS/DTMLMethod.py
===================================================================
--- Zope/branches/hannosch-dtml-vs-accesscontrol/src/OFS/DTMLMethod.py	2010-05-16 19:43:19 UTC (rev 112384)
+++ Zope/branches/hannosch-dtml-vs-accesscontrol/src/OFS/DTMLMethod.py	2010-05-16 19:45:33 UTC (rev 112385)
@@ -27,8 +27,8 @@
 from AccessControl.Permissions import change_proxy_roles
 from AccessControl.Permissions import view as View
 from AccessControl.Permissions import ftp_access
-from AccessControl.DTML import RestrictedDTML
 from AccessControl.requestmethod import requestmethod
+from DocumentTemplate.security import RestrictedDTML
 from OFS.Cache import Cacheable
 from OFS.History import Historical
 from OFS.History import html_diff

Modified: Zope/branches/hannosch-dtml-vs-accesscontrol/src/OFS/FindSupport.py
===================================================================
--- Zope/branches/hannosch-dtml-vs-accesscontrol/src/OFS/FindSupport.py	2010-05-16 19:43:19 UTC (rev 112384)
+++ Zope/branches/hannosch-dtml-vs-accesscontrol/src/OFS/FindSupport.py	2010-05-16 19:45:33 UTC (rev 112385)
@@ -18,7 +18,6 @@
 from string import translate
 
 from AccessControl import ClassSecurityInfo
-from AccessControl.DTML import RestrictedDTML
 from AccessControl.Permission import name_trans
 from AccessControl.Permissions import view_management_screens
 from Acquisition import aq_base
@@ -28,6 +27,7 @@
 from DocumentTemplate.DT_Util import Eval
 from DocumentTemplate.DT_Util import InstanceDict
 from DocumentTemplate.DT_Util import TemplateDict
+from DocumentTemplate.security import RestrictedDTML
 from ExtensionClass import Base
 from zope.interface import implements
 

Modified: Zope/branches/hannosch-dtml-vs-accesscontrol/src/Products/PageTemplates/ZRPythonExpr.py
===================================================================
--- Zope/branches/hannosch-dtml-vs-accesscontrol/src/Products/PageTemplates/ZRPythonExpr.py	2010-05-16 19:43:19 UTC (rev 112384)
+++ Zope/branches/hannosch-dtml-vs-accesscontrol/src/Products/PageTemplates/ZRPythonExpr.py	2010-05-16 19:45:33 UTC (rev 112385)
@@ -59,7 +59,7 @@
         return mod
 
 from DocumentTemplate.DT_Util import TemplateDict, InstanceDict
-from AccessControl.DTML import RestrictedDTML
+from DocumentTemplate.security import RestrictedDTML
 class Rtd(RestrictedDTML, TemplateDict):
     this = None
 

Modified: Zope/branches/hannosch-dtml-vs-accesscontrol/src/Products/PythonScripts/standard.py
===================================================================
--- Zope/branches/hannosch-dtml-vs-accesscontrol/src/Products/PythonScripts/standard.py	2010-05-16 19:43:19 UTC (rev 112384)
+++ Zope/branches/hannosch-dtml-vs-accesscontrol/src/Products/PythonScripts/standard.py	2010-05-16 19:45:33 UTC (rev 112385)
@@ -21,7 +21,6 @@
 
 from urllib import urlencode
 
-from AccessControl.DTML import RestrictedDTML
 from AccessControl.SecurityInfo import ModuleSecurityInfo
 from AccessControl.SecurityManagement import getSecurityManager
 from App.special_dtml import HTML
@@ -38,6 +37,7 @@
 from DocumentTemplate.DT_Var import url_unquote
 from DocumentTemplate.DT_Var import url_unquote_plus
 from DocumentTemplate.DT_Var import restructured_text
+from DocumentTemplate.security import RestrictedDTML
 from ZPublisher.HTTPRequest import record
 
 security = ModuleSecurityInfo()

Modified: Zope/branches/hannosch-dtml-vs-accesscontrol/src/Products/ZCatalog/ZCatalog.py
===================================================================
--- Zope/branches/hannosch-dtml-vs-accesscontrol/src/Products/ZCatalog/ZCatalog.py	2010-05-16 19:43:19 UTC (rev 112384)
+++ Zope/branches/hannosch-dtml-vs-accesscontrol/src/Products/ZCatalog/ZCatalog.py	2010-05-16 19:45:33 UTC (rev 112385)
@@ -22,7 +22,6 @@
 import urllib
 from warnings import warn
 
-from AccessControl.DTML import RestrictedDTML
 from AccessControl.Permission import name_trans
 from AccessControl.Permissions import manage_zcatalog_entries
 from AccessControl.Permissions import manage_zcatalog_indexes
@@ -36,6 +35,7 @@
 from DocumentTemplate.DT_Util import InstanceDict
 from DocumentTemplate.DT_Util import TemplateDict
 from DocumentTemplate.DT_Util import Eval
+from DocumentTemplate.security import RestrictedDTML
 from OFS.Folder import Folder
 from OFS.ObjectManager import ObjectManager
 from Persistence import Persistent

Modified: Zope/branches/hannosch-dtml-vs-accesscontrol/src/Shared/DC/ZRDB/DA.py
===================================================================
--- Zope/branches/hannosch-dtml-vs-accesscontrol/src/Shared/DC/ZRDB/DA.py	2010-05-16 19:43:19 UTC (rev 112384)
+++ Zope/branches/hannosch-dtml-vs-accesscontrol/src/Shared/DC/ZRDB/DA.py	2010-05-16 19:45:33 UTC (rev 112385)
@@ -19,7 +19,6 @@
 import sys
 from time import time
 
-from AccessControl.DTML import RestrictedDTML
 from AccessControl.Permissions import change_database_methods
 from AccessControl.Permissions import use_database_methods
 from AccessControl.Permissions import view_management_screens
@@ -32,6 +31,7 @@
 from App.special_dtml import DTMLFile
 from DocumentTemplate import HTML
 from DocumentTemplate.html_quote import html_quote
+from DocumentTemplate.security import RestrictedDTML
 from DateTime.DateTime import DateTime
 from ExtensionClass import Base
 from BTrees.OOBTree import OOBucket as Bucket