[Zope-Checkins] CVS: Zope/lib/python/OFS - Folder.py:1.101.66.2 OrderedFolder.py:1.1.2.2

[Yvo Schubbe]

Update of /cvs-repository/Zope/lib/python/OFS
In directory cvs.zope.org:/tmp/cvs-serv11433

Modified Files:
      Tag: yuppie-ordersupport-branch
	Folder.py OrderedFolder.py 
Log Message:
made Folder constructor take an initial 'id' argument


=== Zope/lib/python/OFS/Folder.py 1.101.66.1 => 1.101.66.2 ===
--- Zope/lib/python/OFS/Folder.py:1.101.66.1	Fri Apr 25 05:38:57 2003
+++ Zope/lib/python/OFS/Folder.py	Fri May  2 12:31:43 2003
@@ -26,7 +26,6 @@
 from AccessControl import Unauthorized
 from AccessControl.Permissions import add_page_templates
 from AccessControl.Permissions import add_user_folders
-
 from Globals import DTMLFile
 
 
@@ -42,11 +41,10 @@
     value, an 'index_html' and a 'UserFolder' objects are created respectively
     in the new folder.
     """
-    ob=Folder()
-    ob.id=str(id)
-    ob.title=title
+    ob = Folder(id)
+    ob.title = title
     self._setObject(id, ob)
-    ob=self._getOb(id)
+    ob = self._getOb(id)
 
     checkPermission=getSecurityManager().checkPermission
 
@@ -69,7 +67,6 @@
         return self.manage_main(self, REQUEST, update_menu=1)
 
 
-
 class Folder(
     ObjectManager.ObjectManager,
     PropertyManager.PropertyManager,
@@ -102,5 +99,7 @@
 
     __ac_permissions__=()
 
+    def __init__(self, id=''):
+        self.id = str(id)
 
 Globals.default__class_init__(Folder)


=== Zope/lib/python/OFS/OrderedFolder.py 1.1.2.1 => 1.1.2.2 ===
--- Zope/lib/python/OFS/OrderedFolder.py:1.1.2.1	Fri Apr 25 09:07:21 2003
+++ Zope/lib/python/OFS/OrderedFolder.py	Fri May  2 12:31:43 2003
@@ -34,8 +34,7 @@
     value, an 'index_html' and a 'UserFolder' objects are created respectively
     in the new folder.
     """
-    ob = OrderedFolder()
-    ob.id = str(id)
+    ob = OrderedFolder(id)
     ob.title = title
     self._setObject(id, ob)
     ob = self._getOb(id)
@@ -64,9 +63,9 @@
 class OrderedFolder(OrderSupport, Folder):
     """ Extends the default Folder by order support.
     """
-    meta_type='Folder (Ordered)'
     __implements__ = (OrderSupport.__implements__,
                       Folder.__implements__)
+    meta_type='Folder (Ordered)'
 
     manage_options = ( OrderSupport.manage_options +
                        Folder.manage_options[1:] )