[Zope-Checkins] CVS: Zope/lib/python/ZClasses - Property.py:1.35.86.1 ZClass.py:1.64.2.1

[Jim Fulton]

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

Modified Files:
      Tag: mro-advanture-branch
	Property.py ZClass.py 
Log Message:
Changed various modules to fix mro problems when using the C3
method-lookup algorithm.


=== Zope/lib/python/ZClasses/Property.py 1.35 => 1.35.86.1 ===
--- Zope/lib/python/ZClasses/Property.py:1.35	Wed Aug 14 18:03:39 2002
+++ Zope/lib/python/ZClasses/Property.py	Fri Oct 31 14:24:23 2003
@@ -274,9 +274,10 @@
         get_transaction().register(klass)
         klass._p_changed=1
 
-class ZInstanceSheetsSheet(OFS.Traversable.Traversable,
-                           OFS.PropertySheets.View,
-                           OFS.ObjectManager.ObjectManager):
+class ZInstanceSheetsSheet(OFS.PropertySheets.View,
+                           OFS.ObjectManager.ObjectManager,
+                           OFS.Traversable.Traversable,
+                           ):
     "Manage common property sheets"
 
     # Note that we need to make sure we add and remove


=== Zope/lib/python/ZClasses/ZClass.py 1.64 => 1.64.2.1 ===
--- Zope/lib/python/ZClasses/ZClass.py:1.64	Tue Oct 21 09:58:06 2003
+++ Zope/lib/python/ZClasses/ZClass.py	Fri Oct 31 14:24:23 2003
@@ -89,7 +89,7 @@
 
 p_.ZClass_Icon=Globals.ImageFile('class.gif', globals())
 
-class PersistentClass(Base, webdav.Collection.Collection ):
+class PersistentClass(webdav.Collection.Collection, Base):
     def __class_init__(self): pass
 
 manage_addZClassForm=Globals.DTMLFile(
@@ -196,10 +196,7 @@
     return dict
 
 _marker=[]
-class ZClass( Base
-            , webdav.Collection.Collection
-            , OFS.SimpleItem.SimpleItem
-            ):
+class ZClass(webdav.Collection.Collection, OFS.SimpleItem.SimpleItem):
     """Zope Class
     """
     meta_type="Z Class"