Import RestrictedDTML from new location

src/OFS/DTMLMethod.py

@@ -27,8 +27,8 @@ from AccessControl.Permissions import view_management_screens
 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

src/OFS/FindSupport.py

@@ -18,7 +18,6 @@ $Id$
 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 DateTime.DateTime import DateTime
 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
 

src/Products/PageTemplates/ZRPythonExpr.py

@@ -59,7 +59,7 @@ class _SecureModuleImporter:
         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
 

src/Products/PythonScripts/standard.py

@@ -21,7 +21,6 @@ __version__='$Revision: 1.14 $'[11:-2]
 
 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 thousands_commas
 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()

src/Products/ZCatalog/ZCatalog.py

@@ -22,7 +22,6 @@ import time
 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 DateTime.DateTime import DateTime
 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

src/Shared/DC/ZRDB/DA.py

@@ -19,7 +19,6 @@ import string
 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.Extensions import getBrain
 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