[Zope3-checkins] SVN: Zope3/trunk/src/zope/app/mail/delivery.py Merge rev 29758 from Zope3/branches/ZopeX3-3.0.0-Zope-2.8.

[Tim Peters]

Log message for revision 29848:
  Merge rev 29758 from Zope3/branches/ZopeX3-3.0.0-Zope-2.8.
  
  MailDataManager:  implement ZODB 3.4's IDataManager interface.
  
  This repairs what should be the only test failure caused by
  moving from ZODB 3.3.1a1+ to ZODB 3.4a1.
  

Changed:
  U   Zope3/trunk/src/zope/app/mail/delivery.py

-=-
Modified: Zope3/trunk/src/zope/app/mail/delivery.py
===================================================================
--- Zope3/trunk/src/zope/app/mail/delivery.py	2005-04-02 22:13:11 UTC (rev 29847)
+++ Zope3/trunk/src/zope/app/mail/delivery.py	2005-04-02 22:31:11 UTC (rev 29848)
@@ -46,22 +46,34 @@
         self.args = args
         self.onAbort = onAbort
 
-    def prepare(self, transaction):
-        pass
+    def commit(self, transaction):
+        self.callable(*self.args)
 
     def abort(self, transaction):
-        if self.onAbort:
+         if self.onAbort:
             self.onAbort()
 
-    def commit(self, transaction):
-        self.callable(*self.args)
-
-    def savepoint(self, transaction):
-        return NoSavepointSupportRollback(self)
-
     def sortKey(self):
         return id(self)
 
+    # No subtransaction support.
+    def abort_sub(self, transaction):
+        pass
+    commit_sub = abort_sub
+
+    def beforeCompletion(self, transaction):
+        pass
+
+    afterCompletion = beforeCompletion
+
+    def tpc_begin(self, transaction, subtransaction=False):
+        assert not subtransaction
+
+    def tpc_vote(self, transaction):
+        pass
+
+    tpc_finish = tpc_abort = tpc_vote
+
 class AbstractMailDelivery(object):
 
     def newMessageId(self):