[Zope-Checkins] CVS: Zope/lib/python/webdav - EtagSupport.py:1.9.60.1 Resource.py:1.57.2.1

[Jim Fulton]

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

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


=== Zope/lib/python/webdav/EtagSupport.py 1.9 => 1.9.60.1 ===
--- Zope/lib/python/webdav/EtagSupport.py:1.9	Thu Sep 19 11:30:19 2002
+++ Zope/lib/python/webdav/EtagSupport.py	Fri Oct 31 14:24:24 2003
@@ -15,6 +15,7 @@
 
 
 import time, Interface, re
+from ExtensionClass import Base
 
 class EtagBaseInterface(Interface.Base):
     """\
@@ -52,7 +53,7 @@
         Thus, Etags need to be refreshed manually when an object changes.
         """
 
-class EtagSupport:
+class EtagSupport(Base):
     """\
     This class is the basis for supporting Etags in Zope.  It's main
     function right now is to support the *Lost Updates Problem* by


=== Zope/lib/python/webdav/Resource.py 1.57 => 1.57.2.1 ===
--- Zope/lib/python/webdav/Resource.py:1.57	Thu Oct 23 10:16:13 2003
+++ Zope/lib/python/webdav/Resource.py	Fri Oct 31 14:24:24 2003
@@ -26,7 +26,7 @@
 from zExceptions import Unauthorized
 from common import isDavCollection
 
-class Resource(ExtensionClass.Base, Lockable.LockableItem):
+class Resource(Lockable.LockableItem, ExtensionClass.Base):
     """The Resource mixin class provides basic WebDAV support for
     non-collection objects. It provides default implementations
     for most supported WebDAV HTTP methods, however certain methods