Merge branch 'master' into webdav

src/App/special_dtml.py

@@ -27,11 +27,11 @@
 from App.config import getConfiguration
 from ComputedAttribute import ComputedAttribute
 from DocumentTemplate import OLD_DEFAULT_ENCODING
+from DocumentTemplate._DocumentTemplate import InstanceDict
+from DocumentTemplate._DocumentTemplate import TemplateDict
+from DocumentTemplate._DocumentTemplate import render_blocks
 from DocumentTemplate.DT_String import DTReturn
 from DocumentTemplate.DT_String import _marker
-from DocumentTemplate.DT_String import render_blocks
-from DocumentTemplate.DT_Util import InstanceDict
-from DocumentTemplate.DT_Util import TemplateDict
 from Shared.DC.Scripts.Bindings import Bindings
 
 

src/OFS/FindSupport.py

@@ -21,9 +21,9 @@
 from Acquisition import aq_parent
 from App.special_dtml import DTMLFile
 from DateTime.DateTime import DateTime
+from DocumentTemplate._DocumentTemplate import InstanceDict
+from DocumentTemplate._DocumentTemplate import TemplateDict
 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 OFS.interfaces import IFindSupport

src/OFS/OrderSupport.py

@@ -18,10 +18,10 @@
 from AccessControl.Permissions import manage_properties
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from Acquisition import aq_base
-from DocumentTemplate.sequence import sort
 from OFS.interfaces import IOrderedContainer as IOrderedContainer
 from zope.container.contained import notifyContainerModified
 from zope.interface import implementer
+from zope.sequencesort.ssort import sort
 
 
 @implementer(IOrderedContainer)

src/Products/PageTemplates/ZRPythonExpr.py

@@ -18,8 +18,8 @@
 from AccessControl import safe_builtins
 from AccessControl.ZopeGuards import get_safe_globals
 from AccessControl.ZopeGuards import guarded_getattr
-from DocumentTemplate.DT_Util import InstanceDict
-from DocumentTemplate.DT_Util import TemplateDict
+from DocumentTemplate._DocumentTemplate import InstanceDict
+from DocumentTemplate._DocumentTemplate import TemplateDict
 from DocumentTemplate.security import RestrictedDTML
 from RestrictedPython import compile_restricted_eval
 from zope.tales.pythonexpr import PythonExpr

src/Shared/DC/Scripts/Script.py

@@ -21,7 +21,7 @@
 from AccessControl.Permissions import view_management_screens
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from App.special_dtml import DTMLFile
-from DocumentTemplate.DT_Util import TemplateDict
+from DocumentTemplate._DocumentTemplate import TemplateDict
 from OFS.SimpleItem import SimpleItem
 from Shared.DC.Scripts.Bindings import defaultBindings  # NOQA
 from Shared.DC.Scripts.BindingsUI import BindingsUI