[Zope-Checkins] SVN: Zope/trunk/ Start using ZODB 3.4,
merged from Zope/branches/tim-merge-zodb34.
Tim Peters
tim.one at comcast.net
Thu Mar 31 14:56:06 EST 2005
Log message for revision 29762:
Start using ZODB 3.4, merged from Zope/branches/tim-merge-zodb34.
Looks like this may need to be a two-step checkin process.
Purged all uses of get_transaction().
lib/python/zope is now taken from tag Zope3/tags/ZopeX3-3.0.0-Zope-2.8-a2.
The 9 ZODB directories are now taken from current ZODB trunk. A release
tag for that will be made, and Zope trunk switched to use it, later.
Unfortunately, svn refuses to update my local box to the new setup in
one step, presumably because part of this consists of deleting Zope
trunks copies of ZODB code (in favor of svn:externals).
On Windows, all tests passed on tim-merge-zodb34 branch except for the
two that have been failing for months, and without any transaction-
related deprecation warnings.
Changed:
U Zope/trunk/doc/ZODB.txt
_U Zope/trunk/lib/python/
D Zope/trunk/lib/python/BTrees/
D Zope/trunk/lib/python/Persistence/
U Zope/trunk/lib/python/Products/Five/browser.py
U Zope/trunk/lib/python/Products/Five/tests/test_event.py
D Zope/trunk/lib/python/ThreadedAsync/
D Zope/trunk/lib/python/ZEO/
D Zope/trunk/lib/python/ZODB/
D Zope/trunk/lib/python/ZopeUndo/
D Zope/trunk/lib/python/persistent/
D Zope/trunk/lib/python/transaction/
U Zope/trunk/setup.py
_U Zope/trunk/utilities/
D Zope/trunk/utilities/ZODBTools/
-=-
Modified: Zope/trunk/doc/ZODB.txt
===================================================================
--- Zope/trunk/doc/ZODB.txt 2005-03-31 19:52:04 UTC (rev 29761)
+++ Zope/trunk/doc/ZODB.txt 2005-03-31 19:56:06 UTC (rev 29762)
@@ -58,7 +58,8 @@
Don't forget to::
- get_transaction().commit()
+ import transaction
+ transaction.commit()
If you want any changes to made to be saved.
Property changes on: Zope/trunk/lib/python
___________________________________________________________________
Name: svn:externals
- zope svn://svn.zope.org/repos/main/Zope3/tags/ZopeX3-3.0.0-Zope-2.8-pr1/src/zope
+ zope svn://svn.zope.org/repos/main/Zope3/tags/ZopeX3-3.0.0-Zope-2.8-a2/src/zope
BTrees svn://svn.zope.org/repos/main/ZODB/trunk/src/BTrees
Persistence svn://svn.zope.org/repos/main/ZODB/trunk/src/Persistence
persistent svn://svn.zope.org/repos/main/ZODB/trunk/src/persistent
ThreadedAsync svn://svn.zope.org/repos/main/ZODB/trunk/src/ThreadedAsync
transaction svn://svn.zope.org/repos/main/ZODB/trunk/src/transaction
ZEO svn://svn.zope.org/repos/main/ZODB/trunk/src/ZEO
ZODB svn://svn.zope.org/repos/main/ZODB/trunk/src/ZODB
ZopeUndo svn://svn.zope.org/repos/main/ZODB/trunk/src/ZopeUndo
Modified: Zope/trunk/lib/python/Products/Five/browser.py
===================================================================
--- Zope/trunk/lib/python/Products/Five/browser.py 2005-03-31 19:52:04 UTC (rev 29761)
+++ Zope/trunk/lib/python/Products/Five/browser.py 2005-03-31 19:56:06 UTC (rev 29762)
@@ -19,6 +19,9 @@
import sys
from datetime import datetime
+# ZODB
+import transaction
+
# Zope 2
import Acquisition
from Acquisition import aq_inner, aq_parent, aq_base
@@ -212,7 +215,7 @@
except WidgetsError, errors:
self.errors = errors
status = "An error occured."
- get_transaction().abort()
+ transaction.abort()
else:
setUpEditWidgets(self, self.schema, source=self.adapted,
ignoreStickyValues=True,
Modified: Zope/trunk/lib/python/Products/Five/tests/test_event.py
===================================================================
--- Zope/trunk/lib/python/Products/Five/tests/test_event.py 2005-03-31 19:52:04 UTC (rev 29761)
+++ Zope/trunk/lib/python/Products/Five/tests/test_event.py 2005-03-31 19:56:06 UTC (rev 29762)
@@ -17,6 +17,8 @@
if __name__ == '__main__':
execfile(os.path.join(sys.path[0], 'framework.py'))
+import transaction
+
from Products.Five.tests.fivetest import *
from Products.Five.tests.products.FiveTest.subscriber import clear
@@ -60,7 +62,7 @@
manage_addSimpleContent(self.folder, 'foo', 'Foo')
# somehow we need to at least commit a subtransaction to make
# renaming succeed
- get_transaction().commit(1)
+ transaction.commit(1)
self.folder.manage_renameObject('foo', 'bar')
bar = self.folder.bar
events = objectEventCatcher.getEvents()
@@ -94,7 +96,7 @@
manage_addSimpleContent(folder1, 'foo', 'Foo')
foo = folder1.foo
# need to trigger subtransaction before copy/paste can work
- get_transaction().commit(1)
+ transaction.commit(1)
cb = folder1.manage_cutObjects(['foo'])
folder2.manage_pasteObjects(cb)
newfoo = folder2.foo
@@ -124,7 +126,7 @@
manage_addNoVerifyPasteFolder(self.folder, 'folder1')
folder1 = self.folder.folder1
# need to trigger subtransaction before copy/paste can work
- get_transaction().commit(1)
+ transaction.commit(1)
cb = self.folder.manage_copyObjects(['foo'])
folder1.manage_pasteObjects(cb)
foo_copy = folder1.foo
Modified: Zope/trunk/setup.py
===================================================================
--- Zope/trunk/setup.py 2005-03-31 19:52:04 UTC (rev 29761)
+++ Zope/trunk/setup.py 2005-03-31 19:56:06 UTC (rev 29762)
@@ -238,6 +238,10 @@
include_dirs=EXTENSIONCLASS_INCLUDEDIRS + ['persistent'],
define_macros=[('EXCLUDE_INTSET_SUPPORT', None)],
sources=['BTrees/_IOBTree.c']),
+ Extension(name='BTrees._IFBTree',
+ include_dirs=EXTENSIONCLASS_INCLUDEDIRS + ['persistent'],
+ define_macros=[('EXCLUDE_INTSET_SUPPORT', None)],
+ sources=['BTrees/_IFBTree.c']),
Extension(name='BTrees._fsBTree',
include_dirs=EXTENSIONCLASS_INCLUDEDIRS + ['persistent'],
define_macros=[('EXCLUDE_INTSET_SUPPORT', None)],
Property changes on: Zope/trunk/utilities
___________________________________________________________________
Name: svn:externals
+ ZODBTools svn://svn.zope.org/repos/main/ZODB/trunk/src/scripts
More information about the Zope-Checkins
mailing list