[Zope-Checkins] CVS: Zope/lib/python/Products/TemporaryFolder - TemporaryFolder.py:1.8.2.2 __init__.py:1.6.68.2

[Chris McDonough]

Update of /cvs-repository/Zope/lib/python/Products/TemporaryFolder
In directory cvs.zope.org:/tmp/cvs-serv9194

Modified Files:
      Tag: Zope-2_7-branch
	TemporaryFolder.py __init__.py 
Log Message:
Merge import and alias changes from HEAD.


=== Zope/lib/python/Products/TemporaryFolder/TemporaryFolder.py 1.8.2.1 => 1.8.2.2 ===
--- Zope/lib/python/Products/TemporaryFolder/TemporaryFolder.py:1.8.2.1	Mon Jul 21 12:36:17 2003
+++ Zope/lib/python/Products/TemporaryFolder/TemporaryFolder.py	Sat Aug  2 13:49:52 2003
@@ -26,11 +26,13 @@
 """
 __version__='$Revision$'[11:-2]
 
+import os, os.path
+
 import Globals
 from Globals import HTMLFile
 from ZODB.Mount import MountPoint
-import OFS
-import os, os.path
+from OFS.Folder import Folder
+from OFS.SimpleItem import Item
 
 from ZODB.DB import DB
 from TemporaryStorage import TemporaryStorage
@@ -49,12 +51,12 @@
 
 constructTemporaryFolderForm=HTMLFile('dtml/addTemporaryFolder', globals())
 
-class SimpleTemporaryContainer(OFS.Folder.Folder):
+class SimpleTemporaryContainer(Folder):
     # dbtab-style container class
     meta_type = 'Temporary Folder'
     icon = 'misc_/TemporaryFolder/tempfolder.gif'
 
-class MountedTemporaryFolder(MountPoint, OFS.SimpleItem.Item):
+class MountedTemporaryFolder(MountPoint, Item):
     """
     A mounted RAM database with a basic interface for displaying the
     reason the database did not connect.


=== Zope/lib/python/Products/TemporaryFolder/__init__.py 1.6.68.1 => 1.6.68.2 ===
--- Zope/lib/python/Products/TemporaryFolder/__init__.py:1.6.68.1	Mon Jul 21 12:36:17 2003
+++ Zope/lib/python/Products/TemporaryFolder/__init__.py	Sat Aug  2 13:49:52 2003
@@ -18,6 +18,10 @@
 
 import ZODB # for testrunner to be happy
 
+# we import this so that config files can use the shorter name,
+# it's not used directly
+from TemporaryFolder import SimpleTemporaryContainer as TemporaryContainer
+
 def initialize(context):
     import TemporaryFolder
     context.registerClass(