[Checkins] SVN: Products.Ape/trunk/lib/apelib/tests/ use transaction.commit and transaction.abort shortcuts

Thomas Lotze tl at gocept.com
Tue Sep 18 04:49:09 EDT 2007


Log message for revision 79729:
  use transaction.commit and transaction.abort shortcuts

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

-=-
Modified: Products.Ape/trunk/lib/apelib/tests/teststorage.py
===================================================================
--- Products.Ape/trunk/lib/apelib/tests/teststorage.py	2007-09-18 08:00:31 UTC (rev 79728)
+++ Products.Ape/trunk/lib/apelib/tests/teststorage.py	2007-09-18 08:49:08 UTC (rev 79729)
@@ -57,7 +57,7 @@
         self.db = db
 
     def tearDown(self):
-        transaction.get().abort()
+        transaction.abort()
         self.db.close()
         SerialTestBase.tearDown(self)
 
@@ -76,7 +76,7 @@
             root = conn1.root()
             transaction.get().begin()
             root['TestRoot'] = ob
-            transaction.get().commit()
+            transaction.commit()
             ob1 = conn1.root()['TestRoot']
             self.assertEqual(ob1.strdata, ob.strdata)
             self.assertEqual(ob1.items(), ob.items())
@@ -88,7 +88,7 @@
             self.assertEqual(ob2.strdata, ob.strdata)
             self.assertEqual(ob2.items(), ob.items())
             ob2.strdata = '678'
-            transaction.get().commit()
+            transaction.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'
-            transaction.get().commit()
+            transaction.commit()
             conn3.close()
             conn3 = None
             conn3 = self.db.open()
@@ -129,7 +129,7 @@
             root = conn1.root()
             transaction.get().begin()
             root['TestRoot2'] = ob
-            transaction.get().commit()
+            transaction.commit()
             ob1 = conn1.root()['TestRoot2']
             self.assert_(ob1 is ob)
             self.assertEqual(ob1.items(), [('a', 'b')])
@@ -145,7 +145,7 @@
             # Make a change only to the unmanaged persistent object
             # (the "stowaway").
             ob.stowaway['c'] = 'e'
-            transaction.get().commit()
+            transaction.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'
-            transaction.get().commit()
+            transaction.commit()
             conn3.close()
             conn3 = None
             conn3 = self.db.open()
@@ -188,7 +188,7 @@
             root = conn1.root()
             transaction.get().begin()
             root['TestRoot'] = ob
-            transaction.get().commit()
+            transaction.commit()
             ob1 = conn1.root()['TestRoot']
             self.assertEqual(ob1.strdata, ob.strdata)
             self.assertEqual(ob1.items(), ob.items())
@@ -202,7 +202,7 @@
         root = conn.root()
         transaction.get().begin()
         root['TestRoot'] = ob
-        transaction.get().commit()
+        transaction.commit()
         return ob
 
 
@@ -211,7 +211,7 @@
         try:
             ob = conn.root()['TestRoot']
             ob.strdata = 'ghi'
-            transaction.get().commit()
+            transaction.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,
-                              transaction.get().commit)
+                              transaction.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, transaction.get().commit)
+            self.assertRaises(RuntimeError, transaction.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, transaction.get().commit)
+            self.assertRaises(OIDConflictError, transaction.commit)
         finally:
             conn1.close()
 
@@ -275,7 +275,7 @@
             root = conn1.root()
             transaction.get().begin()
             root['TestRoot2'] = ob1
-            transaction.get().commit()
+            transaction.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'
-            transaction.get().abort()
+            transaction.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-18 08:00:31 UTC (rev 79728)
+++ Products.Ape/trunk/lib/apelib/tests/testzodbtables.py	2007-09-18 08:49:08 UTC (rev 79729)
@@ -63,7 +63,7 @@
             table.insert(data)
 
     def tearDown(self):
-        transaction.get().abort()
+        transaction.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-18 08:00:31 UTC (rev 79728)
+++ Products.Ape/trunk/lib/apelib/tests/testzope2fs.py	2007-09-18 08:49:08 UTC (rev 79729)
@@ -62,14 +62,14 @@
             if not c.root().has_key('Application'):
                 from OFS.Application import Application
                 c.root()['Application'] = Application()
-                transaction.get().commit()
+                transaction.commit()
         finally:
             c.close()
         transaction.get().begin()
         self.clear_caches()
 
     def tearDown(self):
-        transaction.get().abort()
+        transaction.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)
-            transaction.get().commit()
+            transaction.commit()
 
             f2 = Folder()
             f2.id = 'Christmas'
             f._setObject(f2.id, f2, set_owner=0)
-            transaction.get().commit()
+            transaction.commit()
 
             f3 = Folder()
             f3.id = 'Eve'
             f2._setObject(f3.id, f3, set_owner=0)
-            transaction.get().commit()
+            transaction.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)
-            transaction.get().commit()
+            transaction.commit()
 
             ob = app.Holidays
             ob._setId('HolidayCalendar')
-            transaction.get().commit()
+            transaction.commit()
         finally:
             conn.close()
 
@@ -147,16 +147,16 @@
             f = Folder()
             f.id = 'Holidays'
             app._setObject(f.id, f, set_owner=0)
-            transaction.get().commit()
+            transaction.commit()
 
             f = None  # Forget the reference to folder
             app._delObject('Holidays')
-            transaction.get().commit()
+            transaction.commit()
 
             f = Folder()
             f.id = 'Holidays'
             app._setObject(f.id, f, set_owner=0)
-            transaction.get().commit()
+            transaction.commit()
         finally:
             conn.close()
 
@@ -168,7 +168,7 @@
             app = conn.root()['Application']
             template = ZopePageTemplate('template', text)
             app._setObject(template.id, template, set_owner=0)
-            transaction.get().commit()
+            transaction.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)
-            transaction.get().commit()
+            transaction.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)
-            transaction.get().commit()
+            transaction.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)
-            transaction.get().commit()
+            transaction.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)
-            transaction.get().commit()
+            transaction.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)
-            transaction.get().commit()
+            transaction.commit()
 
             script = PythonScript('script0')
             script.write('##title=test script\nreturn "Hello, world!"')
             f._setObject(script.id, script, set_owner=0)
-            transaction.get().commit()
+            transaction.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)
-            transaction.get().commit()
+            transaction.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)
-            transaction.get().commit()
+            transaction.commit()
 
             script = PythonScript('script0.dtml')
             script.write('##title=test script\nreturn "No DTML here"')
             f._setObject(script.id, script, set_owner=0)
-            transaction.get().commit()
+            transaction.commit()
 
             script = PythonScript('script0')
             script.write('##title=test script\nreturn "Hello, world!"')
             f._setObject(script.id, script, set_owner=0)
-            transaction.get().commit()
+            transaction.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:
-                transaction.get().abort()
+                transaction.abort()
                 conn2.close()
 
             f._delObject('script0.py')
-            transaction.get().commit()
+            transaction.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')
-            transaction.get().commit()
+            transaction.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)
-            transaction.get().commit()
+            transaction.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')
-            transaction.get().commit()
+            transaction.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))
-            transaction.get().commit()
+            transaction.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')
-            transaction.get().commit()
+            transaction.commit()
 
             dir = self.conn.basepath
             names = os.listdir(dir)
@@ -576,7 +576,7 @@
             content = 'tacked_on_data'
             app = conn.root()['Application']
             app._stowaway = content
-            transaction.get().commit()
+            transaction.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)
-            transaction.get().commit()
+            transaction.commit()
         finally:
             conn.close()
 
@@ -645,7 +645,7 @@
             root['foo'].id = 'foo'
             app.bar = Folder('bar')
             app.bar.id = 'bar'
-            transaction.get().commit()
+            transaction.commit()
 
             conn2 = self.db.open()
             root = conn2.root()
@@ -665,7 +665,7 @@
         try:
             app = conn.root()['Application']
             app.test_attribute = '123'
-            transaction.get().commit()
+            transaction.commit()
         finally:
             conn.close()
 
@@ -692,7 +692,7 @@
             f = Folder()
             f.id = 'bar'
             app._setObject(f.id, f)
-            transaction.get().commit()
+            transaction.commit()
         finally:
             conn.close()
         self.db.close()
@@ -743,9 +743,9 @@
             f = Folder()
             f.id = 'bar'
             app._setObject(f.id, f)
-            transaction.get().commit(1)
+            transaction.commit(1)
             app._delObject(f.id)
-            transaction.get().commit()
+            transaction.commit()
         finally:
             conn.close()
 

Modified: Products.Ape/trunk/lib/apelib/tests/testzope2sql.py
===================================================================
--- Products.Ape/trunk/lib/apelib/tests/testzope2sql.py	2007-09-18 08:00:31 UTC (rev 79728)
+++ Products.Ape/trunk/lib/apelib/tests/testzope2sql.py	2007-09-18 08:49:08 UTC (rev 79729)
@@ -62,9 +62,9 @@
                 if not c.root().has_key('Application'):
                     from OFS.Application import Application
                     c.root()['Application'] = Application()
-                    transaction.get().commit()
+                    transaction.commit()
             finally:
-                transaction.get().abort()
+                transaction.abort()
                 c.close()
         except:
             self.db.close()
@@ -75,7 +75,7 @@
         self.storage.init_databases(clear_all=1)
 
     def tearDown(self):
-        transaction.get().abort()
+        transaction.abort()
         self.clear()
         self.db.close()
 
@@ -93,7 +93,7 @@
             app = conn.root()['Application']
             app.getId()
             self.assertEqual(self.conns['db'].transaction_started, True)
-            transaction.get().commit()
+            transaction.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-18 08:00:31 UTC (rev 79728)
+++ Products.Ape/trunk/lib/apelib/tests/zope2testbase.py	2007-09-18 08:49:08 UTC (rev 79729)
@@ -103,17 +103,17 @@
             f = Folder()
             f.id = 'Holidays'
             app._setObject(f.id, f, set_owner=0)
-            transaction.get().commit()
+            transaction.commit()
 
             f2 = Folder()
             f2.id = 'Christmas'
             f._setObject(f2.id, f2, set_owner=0)
-            transaction.get().commit()
+            transaction.commit()
 
             f3 = Folder()
             f3.id = 'Eve'
             f2._setObject(f3.id, f3, set_owner=0)
-            transaction.get().commit()
+            transaction.commit()
 
             conn2 = self.db.open()
             try:
@@ -137,12 +137,12 @@
             f = Folder()
             f.id = 'Holidays'
             app._setObject(f.id, f, set_owner=0)
-            transaction.get().commit()
+            transaction.commit()
 
             f2 = TestFolder("New Year's Eve")
             f2.id = 'NewYear'
             f._setObject(f2.id, f2, set_owner=0)
-            transaction.get().commit()
+            transaction.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)
-            transaction.get().commit()
+            transaction.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)
-            transaction.get().commit()
+            transaction.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)
-            transaction.get().commit()
+            transaction.commit()
 
             f._setProperty('pi', 3.14, 'float')
             f._setProperty('stuff', ['a', 'bc', 'd'], 'lines')
-            transaction.get().commit()
+            transaction.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)
-            transaction.get().commit()
+            transaction.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'
-            transaction.get().commit()
+            transaction.commit()
 
             conn2 = self.db.open()
             try:
@@ -305,7 +305,7 @@
             f = Folder()
             f.id = 'Holidays'
             app._setObject(f.id, f, set_owner=0)
-            transaction.get().commit()
+            transaction.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')
-            transaction.get().commit()
+            transaction.commit()
 
             conn2 = self.db.open()
             try:
@@ -347,7 +347,7 @@
             f = FixedSchemaTestFolder()
             f.id = 'Holidays'
             app._setObject(f.id, f, set_owner=0)
-            transaction.get().commit()
+            transaction.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
-            transaction.get().commit()
+            transaction.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',), ())
-            transaction.get().commit()
+            transaction.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
-            transaction.get().commit()
+            transaction.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, transaction.get().commit)
+            self.assertRaises(OIDConflictError, transaction.commit)
         finally:
             conn.close()
 
@@ -440,14 +440,14 @@
             f = Folder()
             f.id = 'Holidays'
             app._setObject(f.id, f, set_owner=0)
-            transaction.get().commit()
+            transaction.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)
-            transaction.get().commit()
+            transaction.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))
-            transaction.get().commit()
+            transaction.commit()
 
             self.assertEqual(str(app.file), data)
             conn2 = self.db.open()
             try:
                 app = conn2.root()['Application']
                 self.assertEqual(str(app.file), data)
-                transaction.get().abort()
+                transaction.abort()
             finally:
                 conn2.close()
         finally:
@@ -502,7 +502,7 @@
             app = conn.root()['Application']
             manage_addFile(app, 'file', StringIO(data))
             app.file.content_type = ct
-            transaction.get().commit()
+            transaction.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)
-            transaction.get().commit()
+            transaction.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',)
-            transaction.get().commit()
+            transaction.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)
-            transaction.get().commit()
+            transaction.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)
-            transaction.get().commit()
+            transaction.commit()
 
             conn2 = self.db.open()
             try:
@@ -638,7 +638,7 @@
             f._View_Permission = ('Owner', 'Elder')
             f._Add_Folders_Permission = ['Elder']
 
-            transaction.get().commit()
+            transaction.commit()
 
             conn2 = self.db.open()
             try:
@@ -671,7 +671,7 @@
                 f2._owner = None
                 del f2._proxy_roles
                 f2.__ac_roles__ += ('Teacher',)
-                transaction.get().commit()
+                transaction.commit()
             finally:
                 conn2.close()
 
@@ -693,7 +693,7 @@
             now = time.time()
             app = conn.root()['Application']
             app.title = 'Testing'
-            transaction.get().commit()
+            transaction.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
-            transaction.get().commit()
+            transaction.commit()
             conn2 = self.db.open()
             try:
                 root2 = conn2.root()
                 root2['foo'] = 2
                 self.assertEqual(root2['bar']._p_changed, None)
-                transaction.get().commit()
+                transaction.commit()
             finally:
                 conn2.close()
         finally:
@@ -734,7 +734,7 @@
             f2 = Folder()
             f2.id = 'Easter'
             app.Holidays._setObject(f2.id, f2)
-            transaction.get().commit()
+            transaction.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')
-                transaction.get().commit()
+                transaction.commit()
             finally:
                 conn2.close()
 
@@ -772,14 +772,14 @@
             f.stowaway.id = 'stowaway'
             f.stowaway._prop = 'value1'
             app._setObject(f.id, f, set_owner=0)
-            transaction.get().commit()
+            transaction.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)
-            transaction.get().abort()
+            transaction.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)
-            transaction.get().commit()
+            transaction.commit()
             self.assertEqual(f._p_changed, 0)
 
             self.assertEqual(f.stowaway._p_oid, 'unmanaged')
             f.stowaway._prop = 'value2'
-            transaction.get().commit()
+            transaction.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)
-            transaction.get().commit()
+            transaction.commit()
         
             conn2 = self.db.open()
             try:



More information about the Checkins mailing list