[Checkins] SVN: Products.Ape/trunk/lib/apelib/ fixed deprecated
imports
Thomas Lotze
tl at gocept.com
Tue Sep 18 04:00:32 EDT 2007
Log message for revision 79728:
fixed deprecated imports
Changed:
U Products.Ape/trunk/lib/apelib/tests/teststorage.py
U Products.Ape/trunk/lib/apelib/tests/testzodbtables.py
U Products.Ape/trunk/lib/apelib/tests/testzope2fs.py
U Products.Ape/trunk/lib/apelib/tests/testzope2sql.py
U Products.Ape/trunk/lib/apelib/tests/zope2testbase.py
U Products.Ape/trunk/lib/apelib/zodb3/connection.py
U Products.Ape/trunk/lib/apelib/zope2/apeconf.xml
-=-
Modified: Products.Ape/trunk/lib/apelib/tests/teststorage.py
===================================================================
--- Products.Ape/trunk/lib/apelib/tests/teststorage.py 2007-09-17 22:52:35 UTC (rev 79727)
+++ Products.Ape/trunk/lib/apelib/tests/teststorage.py 2007-09-18 08:00:31 UTC (rev 79728)
@@ -19,7 +19,7 @@
import unittest
from thread import start_new_thread, allocate_lock
-from transaction import get as get_transaction
+import transaction
import ZODB
from Persistence import Persistent, PersistentMapping
@@ -57,7 +57,7 @@
self.db = db
def tearDown(self):
- get_transaction().abort()
+ transaction.get().abort()
self.db.close()
SerialTestBase.tearDown(self)
@@ -74,21 +74,21 @@
# Load the root and create a new object
root = conn1.root()
- get_transaction().begin()
+ transaction.get().begin()
root['TestRoot'] = ob
- get_transaction().commit()
+ transaction.get().commit()
ob1 = conn1.root()['TestRoot']
self.assertEqual(ob1.strdata, ob.strdata)
self.assertEqual(ob1.items(), ob.items())
# Verify a new object was stored and make a change
- get_transaction().begin()
+ transaction.get().begin()
conn2 = self.db.open()
ob2 = conn2.root()['TestRoot']
self.assertEqual(ob2.strdata, ob.strdata)
self.assertEqual(ob2.items(), ob.items())
ob2.strdata = '678'
- get_transaction().commit()
+ transaction.get().commit()
# Verify the change was stored and make another change
conn3 = self.db.open()
@@ -96,7 +96,7 @@
self.assertEqual(ob3.strdata, '678')
self.assertEqual(ob3.items(), ob.items())
ob3.strdata = '901'
- get_transaction().commit()
+ transaction.get().commit()
conn3.close()
conn3 = None
conn3 = self.db.open()
@@ -127,16 +127,16 @@
# Load the root and create a new object
root = conn1.root()
- get_transaction().begin()
+ transaction.get().begin()
root['TestRoot2'] = ob
- get_transaction().commit()
+ transaction.get().commit()
ob1 = conn1.root()['TestRoot2']
self.assert_(ob1 is ob)
self.assertEqual(ob1.items(), [('a', 'b')])
self.assertEqual(ob1.stowaway.items(), [('c', 'd')])
# Verify a new object was stored
- get_transaction().begin()
+ transaction.get().begin()
conn2 = self.db.open()
ob2 = conn2.root()['TestRoot2']
self.assertEqual(ob2.items(), [('a', 'b')])
@@ -145,7 +145,7 @@
# Make a change only to the unmanaged persistent object
# (the "stowaway").
ob.stowaway['c'] = 'e'
- get_transaction().commit()
+ transaction.get().commit()
# Verify the change was stored and make a change to the
# managed persistent object.
@@ -154,7 +154,7 @@
self.assertEqual(ob3.items(), [('a', 'b')])
self.assertEqual(ob3.stowaway.items(), [('c', 'e')])
ob3['a'] = 'z'
- get_transaction().commit()
+ transaction.get().commit()
conn3.close()
conn3 = None
conn3 = self.db.open()
@@ -186,9 +186,9 @@
conn1 = self.db.open()
try:
root = conn1.root()
- get_transaction().begin()
+ transaction.get().begin()
root['TestRoot'] = ob
- get_transaction().commit()
+ transaction.get().commit()
ob1 = conn1.root()['TestRoot']
self.assertEqual(ob1.strdata, ob.strdata)
self.assertEqual(ob1.items(), ob.items())
@@ -200,9 +200,9 @@
ob = TestObject()
ob.strdata = 'abc'
root = conn.root()
- get_transaction().begin()
+ transaction.get().begin()
root['TestRoot'] = ob
- get_transaction().commit()
+ transaction.get().commit()
return ob
@@ -211,7 +211,7 @@
try:
ob = conn.root()['TestRoot']
ob.strdata = 'ghi'
- get_transaction().commit()
+ transaction.get().commit()
finally:
conn.close()
@@ -228,7 +228,7 @@
# Verify that "def" doesn't get written, since it
# conflicts with "ghi".
self.assertRaises(ZODB.POSException.ConflictError,
- get_transaction().commit)
+ transaction.get().commit)
self.assertEqual(ob1.strdata, "ghi")
finally:
conn1.close()
@@ -247,7 +247,7 @@
# Don't let the Connection generate the conflict. This is
# a test of the storage.
conn1._invalidated.clear()
- self.assertRaises(RuntimeError, get_transaction().commit)
+ self.assertRaises(RuntimeError, transaction.get().commit)
finally:
conn1.close()
@@ -259,7 +259,7 @@
ob1 = self._write_basic_object(conn1)
ob1.strdata = 'def'
conn1._set_serial(ob1, '\0' * 8) # Pretend that it's new
- self.assertRaises(OIDConflictError, get_transaction().commit)
+ self.assertRaises(OIDConflictError, transaction.get().commit)
finally:
conn1.close()
@@ -273,9 +273,9 @@
conn1 = self.db.open()
try:
root = conn1.root()
- get_transaction().begin()
+ transaction.get().begin()
root['TestRoot2'] = ob1
- get_transaction().commit()
+ transaction.get().commit()
conn2 = self.db.open()
try:
@@ -399,7 +399,7 @@
ob1 = self._write_basic_object(conn1)
self.assertEqual(len(self.storage.changed), 0)
ob1.strdata = 'def'
- get_transaction().abort()
+ transaction.get().abort()
self.assertEqual(len(self.storage.changed), 0)
finally:
conn1.close()
Modified: Products.Ape/trunk/lib/apelib/tests/testzodbtables.py
===================================================================
--- Products.Ape/trunk/lib/apelib/tests/testzodbtables.py 2007-09-17 22:52:35 UTC (rev 79727)
+++ Products.Ape/trunk/lib/apelib/tests/testzodbtables.py 2007-09-18 08:00:31 UTC (rev 79728)
@@ -19,7 +19,7 @@
import unittest
from time import time
-from transaction import get as get_transaction
+import transaction
from apelib.zodb3 import zodbtables
@@ -63,7 +63,7 @@
table.insert(data)
def tearDown(self):
- get_transaction().abort()
+ transaction.get().abort()
def test_select_by_name(self):
# Searches by primary key
Modified: Products.Ape/trunk/lib/apelib/tests/testzope2fs.py
===================================================================
--- Products.Ape/trunk/lib/apelib/tests/testzope2fs.py 2007-09-17 22:52:35 UTC (rev 79727)
+++ Products.Ape/trunk/lib/apelib/tests/testzope2fs.py 2007-09-18 08:00:31 UTC (rev 79728)
@@ -23,7 +23,7 @@
from tempfile import mktemp
from cStringIO import StringIO
-from transaction import get as get_transaction
+import transaction
from OFS.Application import Application
from OFS.Image import File, manage_addImage, manage_addFile
from Products.PythonScripts.PythonScript import PythonScript
@@ -62,14 +62,14 @@
if not c.root().has_key('Application'):
from OFS.Application import Application
c.root()['Application'] = Application()
- get_transaction().commit()
+ transaction.get().commit()
finally:
c.close()
- get_transaction().begin()
+ transaction.get().begin()
self.clear_caches()
def tearDown(self):
- get_transaction().abort()
+ transaction.get().abort()
if self.db is not None:
self.db.close()
rmtree(self.path)
@@ -100,17 +100,17 @@
f = Folder()
f.id = 'Holidays'
app._setObject(f.id, f, set_owner=0)
- get_transaction().commit()
+ transaction.get().commit()
f2 = Folder()
f2.id = 'Christmas'
f._setObject(f2.id, f2, set_owner=0)
- get_transaction().commit()
+ transaction.get().commit()
f3 = Folder()
f3.id = 'Eve'
f2._setObject(f3.id, f3, set_owner=0)
- get_transaction().commit()
+ transaction.get().commit()
for folder in (f, f2, f3):
text = self.conn.read_annotation(folder._p_oid, 'classification')
@@ -129,11 +129,11 @@
f = Folder()
f.id = 'Holidays'
app._setObject(f.id, f, set_owner=0)
- get_transaction().commit()
+ transaction.get().commit()
ob = app.Holidays
ob._setId('HolidayCalendar')
- get_transaction().commit()
+ transaction.get().commit()
finally:
conn.close()
@@ -147,16 +147,16 @@
f = Folder()
f.id = 'Holidays'
app._setObject(f.id, f, set_owner=0)
- get_transaction().commit()
+ transaction.get().commit()
f = None # Forget the reference to folder
app._delObject('Holidays')
- get_transaction().commit()
+ transaction.get().commit()
f = Folder()
f.id = 'Holidays'
app._setObject(f.id, f, set_owner=0)
- get_transaction().commit()
+ transaction.get().commit()
finally:
conn.close()
@@ -168,7 +168,7 @@
app = conn.root()['Application']
template = ZopePageTemplate('template', text)
app._setObject(template.id, template, set_owner=0)
- get_transaction().commit()
+ transaction.get().commit()
dir = self.conn.basepath
names = os.listdir(dir)
@@ -191,7 +191,7 @@
script = PythonScript('script%d' % n)
script.write('##title=test script\nreturn "OK"')
f._setObject(script.id, script, set_owner=0)
- get_transaction().commit()
+ transaction.get().commit()
conn2 = self.db.open()
try:
@@ -225,7 +225,7 @@
script = PythonScript('script%d.py' % n)
script.write('##title=test script\nreturn "OK"')
f._setObject(script.id, script, set_owner=0)
- get_transaction().commit()
+ transaction.get().commit()
conn2 = self.db.open()
try:
@@ -262,7 +262,7 @@
script = PythonScript('script0')
script.write('##title=test script\nreturn "OK"')
f._setObject(script.id, script, set_owner=0)
- get_transaction().commit()
+ transaction.get().commit()
dir = os.path.join(self.conn.basepath, 'folder')
names = os.listdir(dir)
@@ -273,7 +273,7 @@
script = PythonScript('script0.py')
script.write('##title=test script\nreturn "Hello, world!"')
f._setObject(script.id, script, set_owner=0)
- get_transaction().commit()
+ transaction.get().commit()
# Did it write them correctly?
text = open(os.path.join(dir, 'script0')).read()
@@ -299,12 +299,12 @@
script = PythonScript('script0.py')
script.write('##title=test script\nreturn "OK"')
f._setObject(script.id, script, set_owner=0)
- get_transaction().commit()
+ transaction.get().commit()
script = PythonScript('script0')
script.write('##title=test script\nreturn "Hello, world!"')
f._setObject(script.id, script, set_owner=0)
- get_transaction().commit()
+ transaction.get().commit()
dir = os.path.join(self.conn.basepath, 'folder')
names = os.listdir(dir)
@@ -340,7 +340,7 @@
script = PythonScript('script0')
script.write('##title=test script\nreturn "Hello, world!"')
f._setObject(script.id, script, set_owner=0)
- get_transaction().commit()
+ transaction.get().commit()
conn2 = self.db.open()
try:
@@ -368,17 +368,17 @@
script = PythonScript('script0.py')
script.write('##title=test script\nreturn "OK"')
f._setObject(script.id, script, set_owner=0)
- get_transaction().commit()
+ transaction.get().commit()
script = PythonScript('script0.dtml')
script.write('##title=test script\nreturn "No DTML here"')
f._setObject(script.id, script, set_owner=0)
- get_transaction().commit()
+ transaction.get().commit()
script = PythonScript('script0')
script.write('##title=test script\nreturn "Hello, world!"')
f._setObject(script.id, script, set_owner=0)
- get_transaction().commit()
+ transaction.get().commit()
dir = os.path.join(self.conn.basepath, 'folder')
names = os.listdir(dir)
@@ -394,18 +394,18 @@
self.assertEqual(f2['script0.dtml'](), 'No DTML here')
self.assertEqual(f2['script0'](), 'Hello, world!')
finally:
- get_transaction().abort()
+ transaction.get().abort()
conn2.close()
f._delObject('script0.py')
- get_transaction().commit()
+ transaction.get().commit()
names = os.listdir(dir)
self.assert_(('script0.py') not in names, names)
self.assert_(('script0.dtml') in names, names)
self.assert_(('script0') in names, names)
f._delObject('script0')
- get_transaction().commit()
+ transaction.get().commit()
names = os.listdir(dir)
self.assert_(('script0.py') not in names, names)
self.assert_(('script0.dtml') in names, names)
@@ -414,14 +414,14 @@
script = PythonScript('script0')
script.write('##title=test script\nreturn "Hello, world!"')
f._setObject(script.id, script, set_owner=0)
- get_transaction().commit()
+ transaction.get().commit()
names = os.listdir(dir)
self.assert_(('script0.py') not in names, names)
self.assert_(('script0.dtml') in names, names)
self.assert_(('script0') in names, names)
f._delObject('script0.dtml')
- get_transaction().commit()
+ transaction.get().commit()
names = os.listdir(dir)
self.assert_(('script0.py') not in names, names)
self.assert_(('script0.dtml') not in names, names)
@@ -442,7 +442,7 @@
try:
app = conn.root()['Application']
manage_addImage(app, 'image', StringIO(data))
- get_transaction().commit()
+ transaction.get().commit()
self.assertEqual(app.image.data, data)
conn2 = self.db.open()
@@ -473,7 +473,7 @@
content_type='text/plain')
manage_addFile(app, 'binary_file', StringIO(data),
content_type='application/octet-stream')
- get_transaction().commit()
+ transaction.get().commit()
dir = self.conn.basepath
names = os.listdir(dir)
@@ -576,7 +576,7 @@
content = 'tacked_on_data'
app = conn.root()['Application']
app._stowaway = content
- get_transaction().commit()
+ transaction.get().commit()
# Verify the ability to load it
conn2 = self.db.open()
@@ -610,7 +610,7 @@
f2 = Folder()
f2.id = '.Holidays.properties.dat'
app._setObject(f2.id, f2, set_owner=0)
- get_transaction().commit()
+ transaction.get().commit()
finally:
conn.close()
@@ -645,7 +645,7 @@
root['foo'].id = 'foo'
app.bar = Folder('bar')
app.bar.id = 'bar'
- get_transaction().commit()
+ transaction.get().commit()
conn2 = self.db.open()
root = conn2.root()
@@ -665,7 +665,7 @@
try:
app = conn.root()['Application']
app.test_attribute = '123'
- get_transaction().commit()
+ transaction.get().commit()
finally:
conn.close()
@@ -692,7 +692,7 @@
f = Folder()
f.id = 'bar'
app._setObject(f.id, f)
- get_transaction().commit()
+ transaction.get().commit()
finally:
conn.close()
self.db.close()
@@ -743,9 +743,9 @@
f = Folder()
f.id = 'bar'
app._setObject(f.id, f)
- get_transaction().commit(1)
+ transaction.get().commit(1)
app._delObject(f.id)
- get_transaction().commit()
+ transaction.get().commit()
finally:
conn.close()
Modified: Products.Ape/trunk/lib/apelib/tests/testzope2sql.py
===================================================================
--- Products.Ape/trunk/lib/apelib/tests/testzope2sql.py 2007-09-17 22:52:35 UTC (rev 79727)
+++ Products.Ape/trunk/lib/apelib/tests/testzope2sql.py 2007-09-18 08:00:31 UTC (rev 79728)
@@ -19,7 +19,7 @@
import unittest
import sys
-from transaction import get as get_transaction
+import transaction
from apelib.zodb3.db import ApeDB
from apelib.zodb3.storage import ApeStorage
@@ -62,9 +62,9 @@
if not c.root().has_key('Application'):
from OFS.Application import Application
c.root()['Application'] = Application()
- get_transaction().commit()
+ transaction.get().commit()
finally:
- get_transaction().abort()
+ transaction.get().abort()
c.close()
except:
self.db.close()
@@ -75,7 +75,7 @@
self.storage.init_databases(clear_all=1)
def tearDown(self):
- get_transaction().abort()
+ transaction.get().abort()
self.clear()
self.db.close()
@@ -93,7 +93,7 @@
app = conn.root()['Application']
app.getId()
self.assertEqual(self.conns['db'].transaction_started, True)
- get_transaction().commit()
+ transaction.get().commit()
self.assertEqual(self.conns['db'].transaction_started, False)
finally:
conn.close()
Modified: Products.Ape/trunk/lib/apelib/tests/zope2testbase.py
===================================================================
--- Products.Ape/trunk/lib/apelib/tests/zope2testbase.py 2007-09-17 22:52:35 UTC (rev 79727)
+++ Products.Ape/trunk/lib/apelib/tests/zope2testbase.py 2007-09-18 08:00:31 UTC (rev 79728)
@@ -20,7 +20,7 @@
import time
from types import ListType, TupleType
-from transaction import get as get_transaction
+import transaction
from Acquisition import aq_base
from Persistence import Persistent
from ZODB import POSException
@@ -103,17 +103,17 @@
f = Folder()
f.id = 'Holidays'
app._setObject(f.id, f, set_owner=0)
- get_transaction().commit()
+ transaction.get().commit()
f2 = Folder()
f2.id = 'Christmas'
f._setObject(f2.id, f2, set_owner=0)
- get_transaction().commit()
+ transaction.get().commit()
f3 = Folder()
f3.id = 'Eve'
f2._setObject(f3.id, f3, set_owner=0)
- get_transaction().commit()
+ transaction.get().commit()
conn2 = self.db.open()
try:
@@ -137,12 +137,12 @@
f = Folder()
f.id = 'Holidays'
app._setObject(f.id, f, set_owner=0)
- get_transaction().commit()
+ transaction.get().commit()
f2 = TestFolder("New Year's Eve")
f2.id = 'NewYear'
f._setObject(f2.id, f2, set_owner=0)
- get_transaction().commit()
+ transaction.get().commit()
# Verify the object is in its own database record
self.assertNotEqual(f2._p_oid, None)
@@ -171,7 +171,7 @@
f = TestObjectManager("* Holiday Calendar *")
f.id = 'Holidays'
app._setObject(f.id, f, set_owner=0)
- get_transaction().commit()
+ transaction.get().commit()
# Verify the ability to load it
conn2 = self.db.open()
@@ -196,7 +196,7 @@
f = TestFile(content)
f.id = 'testitem'
app._setObject(f.id, f, set_owner=0)
- get_transaction().commit()
+ transaction.get().commit()
# Verify the object is in its own database record
self.assertNotEqual(f._p_oid, None)
@@ -224,11 +224,11 @@
f.id = 'Holidays'
f.title = 'Holiday Calendar'
app._setObject(f.id, f, set_owner=0)
- get_transaction().commit()
+ transaction.get().commit()
f._setProperty('pi', 3.14, 'float')
f._setProperty('stuff', ['a', 'bc', 'd'], 'lines')
- get_transaction().commit()
+ transaction.get().commit()
conn2 = self.db.open()
try:
@@ -261,14 +261,14 @@
f.id = 'Holidays'
f.title = 'Holiday Calendar'
app._setObject(f.id, f, set_owner=0)
- get_transaction().commit()
+ transaction.get().commit()
f._setProperty('choices', ['alpha', 'omega', 'delta'], 'lines')
f._setProperty('greek', 'choices', 'multiple selection')
f._setProperty('hebrew', 'choices', 'selection')
f.greek = ['alpha', 'omega']
f.hebrew = 'alpha'
- get_transaction().commit()
+ transaction.get().commit()
conn2 = self.db.open()
try:
@@ -305,7 +305,7 @@
f = Folder()
f.id = 'Holidays'
app._setObject(f.id, f, set_owner=0)
- get_transaction().commit()
+ transaction.get().commit()
f._setProperty('string1', 's', 'string')
f._setProperty('float1', 3.14, 'float')
@@ -316,7 +316,7 @@
f._setProperty('text1', 'abc\ndef', 'text')
f._setProperty('boolean0', 0, 'boolean')
f._setProperty('boolean1', 1, 'boolean')
- get_transaction().commit()
+ transaction.get().commit()
conn2 = self.db.open()
try:
@@ -347,7 +347,7 @@
f = FixedSchemaTestFolder()
f.id = 'Holidays'
app._setObject(f.id, f, set_owner=0)
- get_transaction().commit()
+ transaction.get().commit()
f.mystring = f.mystring * 2
f.myint = f.myint * 2
f.mylong = f.mylong * 2
@@ -356,7 +356,7 @@
f.mytext = f.mytext * 2
f.myboolean0 = not f.myboolean0
f.myboolean1 = not f.myboolean1
- get_transaction().commit()
+ transaction.get().commit()
conn2 = self.db.open()
try:
@@ -388,7 +388,7 @@
app._setObject(f.id, f, set_owner=0)
f._doAddUser('ned', 'abcdefg', ('Serf', 'Knight', 'King'), ())
f._doAddUser('joe', '123', ('Geek',), ())
- get_transaction().commit()
+ transaction.get().commit()
# Be sure ZODB sees the unmanaged persistent objects
u = f.data['ned']
@@ -399,7 +399,7 @@
u.roles = ('Knight', 'King')
u.domains = ('localhost',)
del f.data['joe'] # Test user deletion
- get_transaction().commit()
+ transaction.get().commit()
conn2 = self.db.open()
try:
@@ -428,7 +428,7 @@
app = conn.root()['Application']
app.some_attr = 'stuff'
conn._set_serial(app, '\0' * 8) # Pretend that it's new
- self.assertRaises(OIDConflictError, get_transaction().commit)
+ self.assertRaises(OIDConflictError, transaction.get().commit)
finally:
conn.close()
@@ -440,14 +440,14 @@
f = Folder()
f.id = 'Holidays'
app._setObject(f.id, f, set_owner=0)
- get_transaction().commit()
+ transaction.get().commit()
# Do what manage_rename does, without the security checks
ob = app.Holidays.aq_base
app._delObject('Holidays')
ob._setId('HolidayCalendar')
app._setObject(ob.id, ob, set_owner=0)
- get_transaction().commit()
+ transaction.get().commit()
self.assert_(hasattr(app, 'HolidayCalendar'))
self.assert_(not hasattr(app, 'Holidays'))
@@ -472,14 +472,14 @@
try:
app = conn.root()['Application']
manage_addFile(app, 'file', StringIO(data))
- get_transaction().commit()
+ transaction.get().commit()
self.assertEqual(str(app.file), data)
conn2 = self.db.open()
try:
app = conn2.root()['Application']
self.assertEqual(str(app.file), data)
- get_transaction().abort()
+ transaction.get().abort()
finally:
conn2.close()
finally:
@@ -502,7 +502,7 @@
app = conn.root()['Application']
manage_addFile(app, 'file', StringIO(data))
app.file.content_type = ct
- get_transaction().commit()
+ transaction.get().commit()
conn2 = self.db.open()
try:
@@ -522,7 +522,7 @@
app = conn.root()['Application']
template = ZopePageTemplate('template', text)
app._setObject(template.id, template, set_owner=0)
- get_transaction().commit()
+ transaction.get().commit()
conn2 = self.db.open()
try:
@@ -548,7 +548,7 @@
if with_proxy_roles:
# set a proxy role and verify nothing breaks
script._proxy_roles = ('System Administrator',)
- get_transaction().commit()
+ transaction.get().commit()
conn2 = self.db.open()
try:
@@ -579,7 +579,7 @@
method_body = '''All <dtml-var expr="'OK'">.'''
m.manage_edit(method_body, 'test method')
app._setObject(m.getId(), m, set_owner=0)
- get_transaction().commit()
+ transaction.get().commit()
conn2 = self.db.open()
try:
@@ -602,7 +602,7 @@
template = 'SELECT <dtml-var foo> from <dtml-var bar>'
manage_addZSQLMethod(app, 'm', 'test sql', 'none', 'foo bar',
template)
- get_transaction().commit()
+ transaction.get().commit()
conn2 = self.db.open()
try:
@@ -638,7 +638,7 @@
f._View_Permission = ('Owner', 'Elder')
f._Add_Folders_Permission = ['Elder']
- get_transaction().commit()
+ transaction.get().commit()
conn2 = self.db.open()
try:
@@ -671,7 +671,7 @@
f2._owner = None
del f2._proxy_roles
f2.__ac_roles__ += ('Teacher',)
- get_transaction().commit()
+ transaction.get().commit()
finally:
conn2.close()
@@ -693,7 +693,7 @@
now = time.time()
app = conn.root()['Application']
app.title = 'Testing'
- get_transaction().commit()
+ transaction.get().commit()
self.assert_(app._p_mtime > now - 10)
self.assert_(app._p_mtime < now + 10)
finally:
@@ -710,13 +710,13 @@
f = Folder()
f.id = 'bar'
root['bar'] = f
- get_transaction().commit()
+ transaction.get().commit()
conn2 = self.db.open()
try:
root2 = conn2.root()
root2['foo'] = 2
self.assertEqual(root2['bar']._p_changed, None)
- get_transaction().commit()
+ transaction.get().commit()
finally:
conn2.close()
finally:
@@ -734,7 +734,7 @@
f2 = Folder()
f2.id = 'Easter'
app.Holidays._setObject(f2.id, f2)
- get_transaction().commit()
+ transaction.get().commit()
# Verify serialize() found the unmanaged subobjects.
self.assertEqual(app.Holidays._tree._p_oid, 'unmanaged')
# Sanity check
@@ -748,7 +748,7 @@
# Verify deserialize() found the unmanaged subobjects.
self.assertEqual(app2.Holidays._tree._p_oid, 'unmanaged')
app2.Holidays._delObject('Easter')
- get_transaction().commit()
+ transaction.get().commit()
finally:
conn2.close()
@@ -772,14 +772,14 @@
f.stowaway.id = 'stowaway'
f.stowaway._prop = 'value1'
app._setObject(f.id, f, set_owner=0)
- get_transaction().commit()
+ transaction.get().commit()
f.stowaway._p_deactivate()
self.assertEqual(f.stowaway._prop, 'value1')
# Check aborting changes to an unmanaged object.
f.stowaway._prop = 'value2'
self.assertEqual(f._p_changed, 1)
- get_transaction().abort()
+ transaction.get().abort()
self.assertEqual(f.stowaway._prop, 'value1')
self.assertEqual(f._p_changed, 0)
finally:
@@ -799,12 +799,12 @@
f.stowaway.id = 'stowaway'
f.stowaway._prop = 'value1'
app._setObject(f.id, f, set_owner=0)
- get_transaction().commit()
+ transaction.get().commit()
self.assertEqual(f._p_changed, 0)
self.assertEqual(f.stowaway._p_oid, 'unmanaged')
f.stowaway._prop = 'value2'
- get_transaction().commit()
+ transaction.get().commit()
self.assertEqual(f._p_changed, 0)
del f.stowaway._p_changed
@@ -827,7 +827,7 @@
app = conn.root()['Application']
f = createDefaultWorkflowRev2('flow')
app._setObject(f.id, f)
- get_transaction().commit()
+ transaction.get().commit()
conn2 = self.db.open()
try:
Modified: Products.Ape/trunk/lib/apelib/zodb3/connection.py
===================================================================
--- Products.Ape/trunk/lib/apelib/zodb3/connection.py 2007-09-17 22:52:35 UTC (rev 79727)
+++ Products.Ape/trunk/lib/apelib/zodb3/connection.py 2007-09-18 08:00:31 UTC (rev 79728)
@@ -24,7 +24,7 @@
from Acquisition import aq_base
from Persistence import Persistent
-from transaction import Transaction, get as get_transaction
+import transaction
from ZODB.POSException \
import ConflictError, ReadConflictError, InvalidObjectReference, \
StorageError
@@ -64,7 +64,7 @@
self._scan_ctl = ctl = pool_ctl.new_connection()
if ctl.elapsed():
# Scan inside a transaction.
- get_transaction().register(self)
+ transaction.get().register(self)
# Let the scanner know which OIDs matter.
ctl.set_oids(self._cache.cache_data.keys())
# If it's time, scan on behalf of the whole pool.
@@ -87,7 +87,7 @@
root._p_jar = self
root._p_changed = 1
root._p_oid = oid
- t = Transaction()
+ t = transaction.Transaction()
t.note('Initial database creation')
self.tpc_begin(t)
self.commit(root, t)
@@ -337,7 +337,7 @@
invalid = self._invalidated.__contains__
if invalid(oid) or invalid(None):
if not hasattr(obj.__class__, '_p_independent'):
- get_transaction().register(self)
+ transaction.get().register(self)
raise ReadConflictError(object=obj)
invalid=1
else:
@@ -369,7 +369,7 @@
try: self._invalidated.remove(oid)
except KeyError: pass
else:
- get_transaction().register(self)
+ transaction.get().register(self)
raise ConflictError(object=obj)
except ConflictError:
@@ -385,7 +385,7 @@
"""
assert obj._p_jar is self
if obj._p_oid is not None:
- get_transaction().register(obj)
+ transaction.get().register(obj)
# else someone is trying to trick ZODB into registering an
# object with no OID. OFS.Image.File._read_data() does this.
# Since ApeConnection really needs meaningful OIDs, just ignore
@@ -466,7 +466,7 @@
raise RuntimeError(text)
if not self.loaded_objects:
self.loaded_objects = True
- get_transaction().register(self)
+ transaction.get().register(self)
def tpc_abort(self, transaction):
self.loaded_objects = False
Modified: Products.Ape/trunk/lib/apelib/zope2/apeconf.xml
===================================================================
--- Products.Ape/trunk/lib/apelib/zope2/apeconf.xml 2007-09-17 22:52:35 UTC (rev 79727)
+++ Products.Ape/trunk/lib/apelib/zope2/apeconf.xml 2007-09-18 08:00:31 UTC (rev 79728)
@@ -21,7 +21,7 @@
<!-- Root mapper -->
-<mapper name="root" class="Persistence.mapping.PersistentMapping">
+<mapper name="root" class="persistent.mapping.PersistentMapping">
<serializer name="items"
factory="apelib.zodb3.serializers.PersistentMappingSerializer" />
<serializer name="roll_call" factory="apelib.zodb3.serializers.RollCall" />
More information about the Checkins
mailing list