[Zope-Checkins] SVN: Zope/trunk/ Merge rev 37781 from 2.8 branch.

[Tim Peters]

Log message for revision 37782:
  Merge rev 37781 from 2.8 branch.
  
  Collector 1860:  use an optimistic savepoint in CopySupport._getCopy
  (there's no possiblity of rollback here, so no need to insist that the
  data manager support rollbacks).
  
  The other part of this change is in ZODB 3.4.1b4, also stitched in
  by this checkin.
  

Changed:
  _U  Zope/trunk/doc/
  _U  Zope/trunk/lib/python/
  U   Zope/trunk/lib/python/OFS/CopySupport.py
  _U  Zope/trunk/utilities/

-=-

Property changes on: Zope/trunk/doc
___________________________________________________________________
Name: svn:externals
   - ZEO      svn://svn.zope.org/repos/main/ZODB/tags/3.4.1b3/doc/ZEO

   + ZEO      svn://svn.zope.org/repos/main/ZODB/tags/3.4.1b4/doc/ZEO



Property changes on: Zope/trunk/lib/python
___________________________________________________________________
Name: svn:externals
   - zope           svn://svn.zope.org/repos/main/Zope3/tags/ZopeX3-3.0.1-Zope-2.8/src/zope
ZConfig        svn://svn.zope.org/repos/main/ZConfig/tags/ZConfig-2.3
BTrees         svn://svn.zope.org/repos/main/ZODB/tags/3.4.1b3/src/BTrees
Persistence    svn://svn.zope.org/repos/main/ZODB/tags/3.4.1b3/src/Persistence
persistent     svn://svn.zope.org/repos/main/ZODB/tags/3.4.1b3/src/persistent
ThreadedAsync  svn://svn.zope.org/repos/main/ZODB/tags/3.4.1b3/src/ThreadedAsync
transaction    svn://svn.zope.org/repos/main/ZODB/tags/3.4.1b3/src/transaction
ZEO            svn://svn.zope.org/repos/main/ZODB/tags/3.4.1b3/src/ZEO
ZODB           svn://svn.zope.org/repos/main/ZODB/tags/3.4.1b3/src/ZODB
ZopeUndo       svn://svn.zope.org/repos/main/ZODB/tags/3.4.1b3/src/ZopeUndo
zdaemon        svn://svn.zope.org/repos/main/zdaemon/tags/zdaemon-1.1

   + zope           svn://svn.zope.org/repos/main/Zope3/tags/ZopeX3-3.0.1-Zope-2.8/src/zope
ZConfig        svn://svn.zope.org/repos/main/ZConfig/tags/ZConfig-2.3
BTrees         svn://svn.zope.org/repos/main/ZODB/tags/3.4.1b4/src/BTrees
Persistence    svn://svn.zope.org/repos/main/ZODB/tags/3.4.1b4/src/Persistence
persistent     svn://svn.zope.org/repos/main/ZODB/tags/3.4.1b4/src/persistent
ThreadedAsync  svn://svn.zope.org/repos/main/ZODB/tags/3.4.1b4/src/ThreadedAsync
transaction    svn://svn.zope.org/repos/main/ZODB/tags/3.4.1b4/src/transaction
ZEO            svn://svn.zope.org/repos/main/ZODB/tags/3.4.1b4/src/ZEO
ZODB           svn://svn.zope.org/repos/main/ZODB/tags/3.4.1b4/src/ZODB
ZopeUndo       svn://svn.zope.org/repos/main/ZODB/tags/3.4.1b4/src/ZopeUndo
zdaemon        svn://svn.zope.org/repos/main/zdaemon/tags/zdaemon-1.1


Modified: Zope/trunk/lib/python/OFS/CopySupport.py
===================================================================
--- Zope/trunk/lib/python/OFS/CopySupport.py	2005-08-07 23:00:21 UTC (rev 37781)
+++ Zope/trunk/lib/python/OFS/CopySupport.py	2005-08-07 23:40:23 UTC (rev 37782)
@@ -466,7 +466,7 @@
         # 1) Make sure the data about to be exported is current
         # 2) Ensure self._p_jar and container._p_jar are set even if
         #    either one is a new object
-        transaction.commit(1)
+        transaction.savepoint(optimistic=True)
 
         if self._p_jar is None:
             raise CopyError, (


Property changes on: Zope/trunk/utilities
___________________________________________________________________
Name: svn:externals
   - ZODBTools      svn://svn.zope.org/repos/main/ZODB/tags/3.4.1b3/src/scripts

   + ZODBTools      svn://svn.zope.org/repos/main/ZODB/tags/3.4.1b4/src/scripts