[Zope-Checkins] CVS: Zope/lib/python/OFS - Folder.py:1.104.2.1 Image.py:1.147.2.1 ObjectManager.py:1.163.30.1 PropertyManager.py:1.53.2.1 PropertySheets.py:1.91.2.1 SimpleItem.py:1.106.30.1 Traversable.py:1.21.8.1

[Jim Fulton]

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

Modified Files:
      Tag: mro-advanture-branch
	Folder.py Image.py ObjectManager.py PropertyManager.py 
	PropertySheets.py SimpleItem.py Traversable.py 
Log Message:
Changed various modules to fix mro problems when using the C3
method-lookup algorithm.


=== Zope/lib/python/OFS/Folder.py 1.104 => 1.104.2.1 ===
--- Zope/lib/python/OFS/Folder.py:1.104	Tue Oct 21 11:15:54 2003
+++ Zope/lib/python/OFS/Folder.py	Fri Oct 31 14:24:17 2003
@@ -70,9 +70,8 @@
 class Folder(
     ObjectManager.ObjectManager,
     PropertyManager.PropertyManager,
-    AccessControl.Role.RoleManager,
-    webdav.Collection.Collection,
     SimpleItem.Item,
+    AccessControl.Role.RoleManager,
     FindSupport.FindSupport,
     ):
     """


=== Zope/lib/python/OFS/Image.py 1.147 => 1.147.2.1 ===
--- Zope/lib/python/OFS/Image.py:1.147	Tue Oct 21 10:54:27 2003
+++ Zope/lib/python/OFS/Image.py	Fri Oct 31 14:24:17 2003
@@ -64,8 +64,8 @@
         REQUEST['RESPONSE'].redirect(self.absolute_url()+'/manage_main')
 
 
-class File(Persistent, Implicit, PropertyManager,
-           RoleManager, Item_w__name__, Cacheable):
+class File(PropertyManager,
+           Item_w__name__, Persistent, Implicit, RoleManager, Cacheable):
     """A File object is a content object for arbitrary files."""
 
     __implements__ = (WriteLockInterface, HTTPRangeSupport.HTTPRangeInterface)


=== Zope/lib/python/OFS/ObjectManager.py 1.163 => 1.163.30.1 ===
--- Zope/lib/python/OFS/ObjectManager.py:1.163	Tue Feb 11 16:06:28 2003
+++ Zope/lib/python/OFS/ObjectManager.py	Fri Oct 31 14:24:17 2003
@@ -17,7 +17,7 @@
 __version__='$Revision$'[11:-2]
 
 import App.Management, Acquisition, Globals, CopySupport, Products
-import os, App.FactoryDispatcher, re, Products
+import os, App.FactoryDispatcher, re, Products, ExtensionClass
 from OFS.Traversable import Traversable
 from OFS import SimpleItem
 from Globals import DTMLFile, Persistent
@@ -97,11 +97,12 @@
 class ObjectManager(
     CopySupport.CopyContainer,
     App.Management.Navigation,
-    App.Management.Tabs,
-    Acquisition.Implicit,
-    Persistent,
     Collection,
+    App.Management.Tabs,
     Traversable,
+    Persistent,
+    Acquisition.Implicit,
+    ExtensionClass.Base,
     ):
     """Generic object manager
 


=== Zope/lib/python/OFS/PropertyManager.py 1.53 => 1.53.2.1 ===
--- Zope/lib/python/OFS/PropertyManager.py:1.53	Tue Oct 21 11:15:54 2003
+++ Zope/lib/python/OFS/PropertyManager.py	Fri Oct 31 14:24:17 2003
@@ -25,7 +25,7 @@
 
 
 
-class PropertyManager(ExtensionClass.Base, ZDOM.ElementWithAttributes):
+class PropertyManager(ZDOM.ElementWithAttributes, ExtensionClass.Base):
     """
     The PropertyManager mixin class provides an object with
     transparent property management. An object which wants to


=== Zope/lib/python/OFS/PropertySheets.py 1.91 => 1.91.2.1 ===
--- Zope/lib/python/OFS/PropertySheets.py:1.91	Tue Oct 21 11:34:11 2003
+++ Zope/lib/python/OFS/PropertySheets.py	Fri Oct 31 14:24:17 2003
@@ -26,6 +26,7 @@
 from Globals import Persistent
 from Traversable import Traversable
 from Acquisition import aq_base
+from ExtensionClass import Base
 from AccessControl import getSecurityManager
 from webdav.common import isDavCollection
 from cgi import escape
@@ -90,7 +91,7 @@
         except: return ''
 
 
-class PropertySheet(Traversable, Persistent, Implicit):
+class PropertySheet(Traversable, Persistent, Implicit, Base):
     """A PropertySheet is a container for a set of related properties and
        metadata describing those properties. PropertySheets may or may not
        provide a web interface for managing its properties."""


=== Zope/lib/python/OFS/SimpleItem.py 1.106 => 1.106.30.1 ===
--- Zope/lib/python/OFS/SimpleItem.py:1.106	Tue Feb  4 11:38:10 2003
+++ Zope/lib/python/OFS/SimpleItem.py	Fri Oct 31 14:24:17 2003
@@ -41,7 +41,7 @@
 HTML=Globals.HTML
 StringType=type('')
 
-class Item(Base, Resource, CopySource, App.Management.Tabs, Traversable,
+class Item(Resource, CopySource, App.Management.Tabs, Traversable,
            ZDOM.Element,
            AccessControl.Owned.Owned,
            App.Undo.UndoSupport,


=== Zope/lib/python/OFS/Traversable.py 1.21 => 1.21.8.1 ===
--- Zope/lib/python/OFS/Traversable.py:1.21	Mon Sep 29 08:34:38 2003
+++ Zope/lib/python/OFS/Traversable.py	Fri Oct 31 14:24:17 2003
@@ -15,7 +15,7 @@
 $Id$'''
 __version__='$Revision$'[11:-2]
 
-
+from ExtensionClass import Base
 from Acquisition import Acquired, aq_inner, aq_parent, aq_base
 from AccessControl import getSecurityManager
 from AccessControl import Unauthorized
@@ -27,7 +27,7 @@
 
 _marker=[]
 
-class Traversable:
+class Traversable(Base):
 
     absolute_url__roles__=None # Public
     def absolute_url(self, relative=0):