Commit c0dc9ef5 authored by Godefroid Chapelle's avatar Godefroid Chapelle

Reproducing issue does not depend on Acquisition :-)

parent 8e56ef6b
...@@ -197,8 +197,8 @@ setup(name="ZODB3", ...@@ -197,8 +197,8 @@ setup(name="ZODB3",
classifiers = filter(None, classifiers.split("\n")), classifiers = filter(None, classifiers.split("\n")),
long_description = long_description, long_description = long_description,
test_suite="__main__.alltests", # to support "setup.py test" test_suite="__main__.alltests", # to support "setup.py test"
tests_require = ['zope.testing', 'Acquisition', manuel_version], tests_require = ['zope.testing', manuel_version],
extras_require = dict(test=['zope.testing', 'Acquisition', manuel_version]), extras_require = dict(test=['zope.testing', manuel_version]),
install_requires = [ install_requires = [
transaction_version, transaction_version,
'zc.lockfile', 'zc.lockfile',
......
...@@ -17,7 +17,6 @@ from persistent.mapping import PersistentMapping ...@@ -17,7 +17,6 @@ from persistent.mapping import PersistentMapping
from ZODB.POSException import ReadConflictError from ZODB.POSException import ReadConflictError
from ZODB.POSException import TransactionFailedError from ZODB.POSException import TransactionFailedError
import Acquisition
from BTrees.OOBTree import OOBTree from BTrees.OOBTree import OOBTree
import transaction import transaction
import unittest import unittest
...@@ -31,14 +30,6 @@ class P(Persistent): ...@@ -31,14 +30,6 @@ class P(Persistent):
pass pass
class AcqImplicitP(P, Acquisition.Implicit):
pass
class AcqImplicitOOBTree(OOBTree, Acquisition.Implicit):
pass
class ZODBTests(ZODB.tests.util.TestCase): class ZODBTests(ZODB.tests.util.TestCase):
def setUp(self): def setUp(self):
...@@ -349,12 +340,12 @@ class ZODBTests(ZODB.tests.util.TestCase): ...@@ -349,12 +340,12 @@ class ZODBTests(ZODB.tests.util.TestCase):
try: try:
transaction.begin() transaction.begin()
root = cn.root() root = cn.root()
added_before_savepoint = AcqImplicitP() added_before_savepoint = P()
root['added_before_savepoint'] = added_before_savepoint root['added_before_savepoint'] = added_before_savepoint
sp = transaction.savepoint() sp = transaction.savepoint()
added_before_savepoint.btree = new_btree = AcqImplicitOOBTree() added_before_savepoint.btree = new_btree = OOBTree()
cn.add(new_btree) cn.add(new_btree)
new_btree['change_to_trigger_read_current'] = AcqImplicitP() new_btree['change_to_trigger_read_current'] = P()
sp.rollback() sp.rollback()
transaction.commit() transaction.commit()
self.assertTrue('added_before_savepoint' in root) self.assertTrue('added_before_savepoint' in root)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment