Changed things that use HTMLFile to DTMLFile.

lib/python/OFS/CopySupport.py

@@ -83,7 +83,7 @@
 # 
 ##############################################################################
 __doc__="""Copy interface"""
-__version__='$Revision: 1.62 $'[11:-2]
+__version__='$Revision: 1.63 $'[11:-2]
 
 import sys, string, Globals, Moniker, tempfile, ExtensionClass
 from marshal import loads, dumps
@@ -272,7 +272,7 @@ class CopyContainer(ExtensionClass.Base):
         return ''
 
 
-    manage_renameForm=Globals.HTMLFile('dtml/renameForm', globals())
+    manage_renameForm=Globals.DTMLFile('dtml/renameForm', globals())
 
     def manage_renameObjects(self, ids, new_ids, REQUEST=None):
         """Rename several sub-objects"""

lib/python/OFS/DTMLDocument.py

@@ -84,10 +84,10 @@
 ##############################################################################
 """DTML Document objects."""
 
-__version__='$Revision: 1.40 $'[11:-2]
+__version__='$Revision: 1.41 $'[11:-2]
 from DocumentTemplate.DT_Util import InstanceDict, TemplateDict
 from ZPublisher.Converters import type_converters
-from Globals import HTML, HTMLFile, MessageDialog
+from Globals import HTML, DTMLFile, MessageDialog
 from OFS.content_types import guess_content_type
 from DTMLMethod import DTMLMethod, decapitate
 from PropertyManager import PropertyManager
@@ -200,7 +200,7 @@ This is the <dtml-var id> Document.
 </p>
 <dtml-var standard_html_footer>"""
 
-addForm=HTMLFile('dtml/documentAdd', globals())
+addForm=DTMLFile('dtml/documentAdd', globals())
 
 def addDTMLDocument(self, id, title='', file='', REQUEST=None, submit=None):
     """Add a DTML Document object with the contents of file. If

lib/python/OFS/DTMLMethod.py

@@ -84,10 +84,10 @@
 ##############################################################################
 """DTML Method objects."""
 
-__version__='$Revision: 1.57 $'[11:-2]
+__version__='$Revision: 1.58 $'[11:-2]
 
 import History
-from Globals import HTML, HTMLFile, MessageDialog
+from Globals import HTML, DTMLFile, MessageDialog
 from string import join,split,strip,rfind,atoi,lower
 from SimpleItem import Item_w__name__, pretty_tb
 from OFS.content_types import guess_content_type
@@ -229,7 +229,7 @@ class DTMLMethod(HTML, Acquisition.Implicit, RoleManager,
                 kw[key] = val
             self.ZCacheable_set(result, keywords=kw)
 
-    ZCacheable_configHTML = HTMLFile('dtml/cacheNamespaceKeys', globals())
+    ZCacheable_configHTML = DTMLFile('dtml/cacheNamespaceKeys', globals())
 
     def getCacheNamespaceKeys(self):
         '''
@@ -260,13 +260,13 @@ class DTMLMethod(HTML, Acquisition.Implicit, RoleManager,
     def validate(self, inst, parent, name, value, md):
         return getSecurityManager().validate(inst, parent, name, value)
 
-    manage_editForm=HTMLFile('dtml/documentEdit', globals())
+    manage_editForm=DTMLFile('dtml/documentEdit', globals())
 
     # deprecated!
     manage_uploadForm=manage_editForm
 
     manage=manage_main=manage_editDocument=manage_editForm
-    manage_proxyForm=HTMLFile('dtml/documentProxy', globals())
+    manage_proxyForm=DTMLFile('dtml/documentProxy', globals())
 
     _size_changes={
         'Bigger': (5,5),
@@ -425,7 +425,7 @@ in the <dtml-var title_and_id> Folder.
 </p>
 <dtml-var standard_html_footer>"""
 
-addForm=HTMLFile('dtml/methodAdd', globals())
+addForm=DTMLFile('dtml/methodAdd', globals())
 
 def addDTMLMethod(self, id, title='', file='', REQUEST=None, submit=None):
     """Add a DTML Method object with the contents of file. If

lib/python/OFS/FindSupport.py

@@ -83,13 +83,13 @@
 # 
 ##############################################################################
 __doc__="""Find support"""
-__version__='$Revision: 1.22 $'[11:-2]
+__version__='$Revision: 1.23 $'[11:-2]
 
 
 import sys, os, string, time, Globals, ExtensionClass
 from DocumentTemplate.DT_Util import Eval, expr_globals
 from AccessControl.Permission import name_trans
-from Globals import HTMLFile
+from Globals import DTMLFile
 from DocumentTemplate.DT_Util import InstanceDict, TemplateDict
 from DateTime import DateTime
 from string import find
@@ -99,14 +99,14 @@ class FindSupport(ExtensionClass.Base):
     """Find support for Zope Folders"""
 
 #findframe is deprecated
-    manage_findFrame=HTMLFile('dtml/findFrame', globals())
-    manage_findForm=HTMLFile('dtml/findForm', globals(),
+    manage_findFrame=DTMLFile('dtml/findFrame', globals())
+    manage_findForm=DTMLFile('dtml/findForm', globals(),
                              management_view='Find')
-    manage_findAdv=HTMLFile('dtml/findAdv', globals(),
+    manage_findAdv=DTMLFile('dtml/findAdv', globals(),
                             management_view='Find',
                             help_topic='Find_Advanced.stx',
                             help_product='OFSP')
-    manage_findResult=HTMLFile('dtml/findResult', globals(),
+    manage_findResult=DTMLFile('dtml/findResult', globals(),
                                management_view='Find')
 
     __ac_permissions__=(

lib/python/OFS/Folder.py

@@ -87,18 +87,18 @@
 
 Folders are the basic container objects and are analogous to directories.
 
-$Id: Folder.py,v 1.92 2001/01/08 22:46:58 brian Exp $"""
+$Id: Folder.py,v 1.93 2001/01/11 21:11:04 chrism Exp $"""
 
-__version__='$Revision: 1.92 $'[11:-2]
+__version__='$Revision: 1.93 $'[11:-2]
 
 import Globals, SimpleItem, ObjectManager, PropertyManager
 import AccessControl.Role, webdav.Collection, FindSupport
 
-from Globals import HTMLFile
+from Globals import DTMLFile
 from AccessControl import getSecurityManager
 
 
-manage_addFolderForm=HTMLFile('dtml/folderAdd', globals())
+manage_addFolderForm=DTMLFile('dtml/folderAdd', globals())
 
 def manage_addFolder(self, id, title='',
                      createPublic=0,

lib/python/OFS/History.py

@@ -84,7 +84,7 @@
 ##############################################################################
 """Object Histories"""
 
-__version__='$Revision: 1.5 $'[11:-2]
+__version__='$Revision: 1.6 $'[11:-2]
 
 import Globals, ndiff, ExtensionClass
 from DateTime import DateTime
@@ -170,7 +170,7 @@ class Historical(ExtensionClass.Base):
                      },
                    )
 
-    manage_change_history_page=Globals.HTMLFile(
+    manage_change_history_page=Globals.DTMLFile(
         'dtml/history', globals(),
         HistoryBatchSize=20,
         first_transaction=0, last_transaction=20)
@@ -222,7 +222,7 @@ class Historical(ExtensionClass.Base):
     def manage_afterHistoryCopy(self): pass # ? (Hook)
 
     
-    _manage_historyComparePage=Globals.HTMLFile(
+    _manage_historyComparePage=Globals.DTMLFile(
         'dtml/historyCompare', globals(), management_view='History')
     def manage_historyCompare(self, rev1, rev2, REQUEST,
                               historyComparisonResults=''):