[Zope3-checkins] SVN: Zope3/branches/ZopeX3-3.0/src/zope/app/mail/delivery.py Merge r26653 and r26654 from trunk: IDataManagers are now required

[Philipp von Weitershausen]

Log message for revision 26655:
  Merge r26653 and r26654 from trunk: IDataManagers are now required
  to have a sortKey() method for conflict resolution
  


Changed:
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/mail/delivery.py


-=-
Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/mail/delivery.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/mail/delivery.py	2004-07-21 15:34:52 UTC (rev 26654)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/mail/delivery.py	2004-07-21 15:38:10 UTC (rev 26655)
@@ -35,7 +35,6 @@
 from transaction.util import NoSavepointSupportRollback
 
 class MailDataManager(object):
-
     implements(IDataManager)
 
     def __init__(self, callable, args=(), onAbort=None):
@@ -56,6 +55,8 @@
     def savepoint(self, transaction):
         return NoSavepointSupportRollback(self)
 
+    def sortKey(self):
+        return id(self)
 
 class AbstractMailDelivery(object):