[Zope3-checkins] SVN: Zope3/trunk/src/ Updated to work with a version of ZODB without the premature and

[Jim Fulton]

Log message for revision 29970:
  Updated to work with a version of ZODB without the premature and
  non-working avepoint feature.
  

Changed:
  _U  Zope3/trunk/src/
  U   Zope3/trunk/src/zope/app/apidoc/bookmodule/book.zcml
  U   Zope3/trunk/src/zope/app/mail/delivery.py
  U   Zope3/trunk/src/zope/app/rdb/__init__.py

-=-

Property changes on: Zope3/trunk/src
___________________________________________________________________
Name: svn:externals
   - BTrees         svn://svn.zope.org/repos/main/ZODB/tags/3.4.0a2/src/BTrees
persistent     svn://svn.zope.org/repos/main/ZODB/tags/3.4.0a2/src/persistent
ThreadedAsync  svn://svn.zope.org/repos/main/ZODB/tags/3.4.0a2/src/ThreadedAsync
transaction    svn://svn.zope.org/repos/main/ZODB/tags/3.4.0a2/src/transaction
ZEO            svn://svn.zope.org/repos/main/ZODB/tags/3.4.0a2/src/ZEO
ZODB           svn://svn.zope.org/repos/main/ZODB/tags/3.4.0a2/src/ZODB

   + BTrees         svn://svn.zope.org/repos/main/ZODB/tags/3.4.0a3/src/BTrees
persistent     svn://svn.zope.org/repos/main/ZODB/tags/3.4.0a3/src/persistent
ThreadedAsync  svn://svn.zope.org/repos/main/ZODB/tags/3.4.0a3/src/ThreadedAsync
transaction    svn://svn.zope.org/repos/main/ZODB/tags/3.4.0a3/src/transaction
ZEO            svn://svn.zope.org/repos/main/ZODB/tags/3.4.0a3/src/ZEO
ZODB           svn://svn.zope.org/repos/main/ZODB/tags/3.4.0a3/src/ZODB


Modified: Zope3/trunk/src/zope/app/apidoc/bookmodule/book.zcml
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/bookmodule/book.zcml	2005-04-13 22:03:01 UTC (rev 29969)
+++ Zope3/trunk/src/zope/app/apidoc/bookmodule/book.zcml	2005-04-13 23:00:22 UTC (rev 29970)
@@ -395,15 +395,6 @@
         />
   </configure>
 
-  <!-- Transactions -->
-  <configure package="transaction">
-    <bookchapter
-        id="transaction"
-        title="Transaction API"
-        doc_path="notes.txt"
-        />
-  </configure>
-
   <!-- ZODB -->
   <configure package="ZODB">
     <bookchapter

Modified: Zope3/trunk/src/zope/app/mail/delivery.py
===================================================================
--- Zope3/trunk/src/zope/app/mail/delivery.py	2005-04-13 22:03:01 UTC (rev 29969)
+++ Zope3/trunk/src/zope/app/mail/delivery.py	2005-04-13 23:00:22 UTC (rev 29970)
@@ -36,7 +36,6 @@
 from zope.app.mail.maildir import Maildir
 from transaction.interfaces import IDataManager
 import transaction
-from transaction.util import NoSavepointSupportRollback
 
 class MailDataManager(object):
     implements(IDataManager)

Modified: Zope3/trunk/src/zope/app/rdb/__init__.py
===================================================================
--- Zope3/trunk/src/zope/app/rdb/__init__.py	2005-04-13 22:03:01 UTC (rev 29969)
+++ Zope3/trunk/src/zope/app/rdb/__init__.py	2005-04-13 23:00:22 UTC (rev 29970)
@@ -26,8 +26,7 @@
 from persistent import Persistent
 
 import transaction
-from transaction.interfaces import IDataManager, IRollback
-from transaction.util import NoSavepointSupportRollback
+from transaction.interfaces import IDataManager
 
 from zope.security.checker import NamesChecker
 
@@ -375,30 +374,6 @@
     def commit(self, txn):
         self._dbconn.commit()
 
-    def savepoint(self, txn):
-        """Create a savepoint that can not be rolled back
-
-        Savepoint implementation for data managers that do not
-        support savepoints. We don't raise an error here, because
-        there's no harm in ignoring a call if no one ever tries to
-        rollback a savepoint.  By ignoring the call, the data
-        manager can be used with data managers that so support
-        savepoints.
-
-        We return a rollback that raises an error if we call it.
-
-        >>> dm = ZopeDBTransactionManager(None)
-        >>> rb = dm.savepoint(None)
-        >>> rb.rollback()
-        Traceback (most recent call last):
-        ...
-        NotImplementedError: """ \
-           """ZopeDBTransactionManager data managers do not support """ \
-           """savepoints (aka subtransactions
-        """
-
-        return NoSavepointSupportRollback(self)
-
     def sortKey(self):
         """
         ZODB uses a global sort order to prevent deadlock when it commits
@@ -457,7 +432,3 @@
     klass_namespace['__slots__'] = tuple(columns)
 
     return type('GeneratedRowClass', (Row,), klass_namespace)
-
-
-
-