Changed things which used HTMLFile to use DTMLFile.

lib/python/Products/OFSP/Version.py

@@ -84,7 +84,7 @@
 ##############################################################################
 """Version object"""
 
-__version__='$Revision: 1.47 $'[11:-2]
+__version__='$Revision: 1.48 $'[11:-2]
 
 import Globals, time
 from AccessControl.Role import RoleManager
@@ -99,7 +99,7 @@ from OFS.ObjectManager import BeforeDeleteException
 
 class VersionException(BeforeDeleteException): pass
 
-manage_addVersionForm=Globals.HTMLFile('dtml/versionAdd', globals())
+manage_addVersionForm=Globals.DTMLFile('dtml/versionAdd', globals())
 
 def manage_addVersion(self, id, title, REQUEST=None):
     """ """
@@ -144,9 +144,9 @@ class Version(Persistent,Implicit,RoleManager,Item):
         self.id=id
         self.title=title
 
-    manage_main=Globals.HTMLFile('dtml/version', globals())
-    manage_end=Globals.HTMLFile('dtml/versionEnd', globals())
-    manage_editForm   =Globals.HTMLFile('dtml/versionEdit', globals())
+    manage_main=Globals.DTMLFile('dtml/version', globals())
+    manage_end=Globals.DTMLFile('dtml/versionEnd', globals())
+    manage_editForm   =Globals.DTMLFile('dtml/versionEdit', globals())
 
     def title_and_id(self):
         r=Version.inheritedAttribute('title_and_id')(self)

lib/python/Products/StandardCacheManagers/AcceleratedHTTPCacheManager.py

@@ -94,7 +94,7 @@ from OFS.Cache import Cache, CacheManager
 from OFS.SimpleItem import SimpleItem
 import time
 import Globals
-from Globals import HTMLFile
+from Globals import DTMLFile
 import urlparse, httplib
 from urllib import quote
 from string import lower, join, split
@@ -230,7 +230,7 @@ class AcceleratedHTTPCacheManager (CacheManager, SimpleItem):
         ' '
         return self._settings.copy()  # Don't let DTML modify it.
 
-    manage_main = HTMLFile('dtml/propsAccel', globals())
+    manage_main = DTMLFile('dtml/propsAccel', globals())
 
     def manage_editProps(self, title, settings=None, REQUEST=None):
         ' '
@@ -247,7 +247,7 @@ class AcceleratedHTTPCacheManager (CacheManager, SimpleItem):
             return self.manage_main(
                 self, REQUEST, manage_tabs_message='Properties changed.')
 
-    manage_stats = HTMLFile('dtml/statsAccel', globals())
+    manage_stats = DTMLFile('dtml/statsAccel', globals())
 
     def _getSortInfo(self):
         """
@@ -295,7 +295,7 @@ class AcceleratedHTTPCacheManager (CacheManager, SimpleItem):
 Globals.default__class_init__(AcceleratedHTTPCacheManager)
 
 
-manage_addAcceleratedHTTPCacheManagerForm = HTMLFile('dtml/addAccel',
+manage_addAcceleratedHTTPCacheManagerForm = DTMLFile('dtml/addAccel',
                                                      globals())
 
 def manage_addAcceleratedHTTPCacheManager(self, id, REQUEST=None):

lib/python/Products/StandardCacheManagers/RAMCacheManager.py

@@ -95,7 +95,7 @@ from OFS.SimpleItem import SimpleItem
 from thread import allocate_lock
 import time
 import Globals
-from Globals import HTMLFile
+from Globals import DTMLFile
 from string import join, split
 
 try: from cPickle import Pickler
@@ -412,7 +412,7 @@ class RAMCacheManager (CacheManager, SimpleItem):
         'Returns the current cache settings.'
         return self._settings.copy()
 
-    manage_main = HTMLFile('dtml/propsRCM', globals())
+    manage_main = DTMLFile('dtml/propsRCM', globals())
 
     def manage_editProps(self, title, settings=None, REQUEST=None):
         'Changes the cache settings.'
@@ -431,7 +431,7 @@ class RAMCacheManager (CacheManager, SimpleItem):
             return self.manage_main(
                 self, REQUEST, manage_tabs_message='Properties changed.')
 
-    manage_stats = HTMLFile('dtml/statsRCM', globals())
+    manage_stats = DTMLFile('dtml/statsRCM', globals())
 
     def _getSortInfo(self):
         """
@@ -473,7 +473,7 @@ class RAMCacheManager (CacheManager, SimpleItem):
 Globals.default__class_init__(RAMCacheManager)
 
 
-manage_addRAMCacheManagerForm = HTMLFile('dtml/addRCM', globals())
+manage_addRAMCacheManagerForm = DTMLFile('dtml/addRCM', globals())
 
 def manage_addRAMCacheManager(self, id, REQUEST=None):
     'Adds a RAM cache manager to the folder.'