[Zope-Checkins] SVN: Zope/trunk/ __builtin__.get_transaction() is
officially deprecated in ZODB 3.4.
Tim Peters
tim.one at comcast.net
Mon Mar 28 11:34:13 EST 2005
Log message for revision 29694:
__builtin__.get_transaction() is officially deprecated in ZODB 3.4.
Got rid of it in the Zope source. The remaining instances are in
code stitched in from ZODB. Those will go away by magic when
ZODB 3.4 gets stitched in.
Changed:
U Zope/trunk/doc/DEBUGGING.txt
U Zope/trunk/doc/HISTORY.txt
U Zope/trunk/doc/UNITTEST.txt
U Zope/trunk/lib/python/AccessControl/tests/testBindings.py
U Zope/trunk/lib/python/AccessControl/tests/testUserFolder.py
U Zope/trunk/lib/python/App/Product.py
U Zope/trunk/lib/python/App/RefreshFuncs.py
U Zope/trunk/lib/python/App/Undo.py
U Zope/trunk/lib/python/OFS/Application.py
U Zope/trunk/lib/python/OFS/CopySupport.py
U Zope/trunk/lib/python/OFS/Image.py
U Zope/trunk/lib/python/OFS/tests/testCopySupport.py
U Zope/trunk/lib/python/OFS/tests/testFileAndImage.py
U Zope/trunk/lib/python/OFS/tests/testRanges.py
U Zope/trunk/lib/python/OFS/tests/testTraverse.py
U Zope/trunk/lib/python/Products/OFSP/Version.py
U Zope/trunk/lib/python/Products/PageTemplates/tests/testZopePageTemplate.py
U Zope/trunk/lib/python/Products/PluginIndexes/TextIndex/tests/testTextIndex.py
U Zope/trunk/lib/python/Products/Sessions/stresstests/stresstestMultiThread.py
U Zope/trunk/lib/python/Products/Sessions/tests/testSessionDataManager.py
U Zope/trunk/lib/python/Products/SiteAccess/Extensions/updata.py
U Zope/trunk/lib/python/Products/SiteAccess/tests/testVirtualHostMonster.py
U Zope/trunk/lib/python/Products/SiteErrorLog/tests/testSiteErrorLog.py
U Zope/trunk/lib/python/Products/TemporaryFolder/patchfs.py
U Zope/trunk/lib/python/Products/Transience/tests/testTimeoutRelated.py
U Zope/trunk/lib/python/Products/Transience/tests/testTransactionHelper.py
U Zope/trunk/lib/python/Products/ZCTextIndex/tests/indexhtml.py
U Zope/trunk/lib/python/Products/ZCTextIndex/tests/mailtest.py
U Zope/trunk/lib/python/Products/ZCTextIndex/tests/mhindex.py
U Zope/trunk/lib/python/Products/ZCTextIndex/tests/testIndex.py
U Zope/trunk/lib/python/Products/ZCTextIndex/tests/testLexicon.py
U Zope/trunk/lib/python/Products/ZCatalog/README.txt
U Zope/trunk/lib/python/Products/ZCatalog/ZCatalog.py
U Zope/trunk/lib/python/Products/ZCatalog/regressiontests/loadmail.py
U Zope/trunk/lib/python/Products/ZCatalog/regressiontests/regressionCatalog.py
U Zope/trunk/lib/python/Products/ZCatalog/regressiontests/regressionCatalogTiming.py
U Zope/trunk/lib/python/Products/ZCatalog/tests/testCatalog.py
U Zope/trunk/lib/python/Products/ZODBMountPoint/MountedObject.py
U Zope/trunk/lib/python/Products/ZODBMountPoint/tests/testMountPoint.py
U Zope/trunk/lib/python/Shared/DC/ZRDB/THUNK.py
U Zope/trunk/lib/python/Shared/DC/ZRDB/TM.py
U Zope/trunk/lib/python/Shared/DC/ZRDB/dbi_db.py
U Zope/trunk/lib/python/Testing/ZopeTestCase/testBaseTestCase.py
U Zope/trunk/lib/python/Testing/ZopeTestCase/testWebserver.py
U Zope/trunk/lib/python/Testing/ZopeTestCase/testZODBCompat.py
U Zope/trunk/lib/python/Testing/ZopeTestCase/utils.py
U Zope/trunk/lib/python/ZClasses/Property.py
U Zope/trunk/lib/python/ZClasses/ZClass.py
U Zope/trunk/lib/python/ZPublisher/Publish.py
U Zope/trunk/lib/python/ZServer/README.txt
U Zope/trunk/lib/python/Zope2/App/startup.py
U Zope/trunk/lib/python/Zope2/Startup/zopectl.py
U Zope/trunk/lib/python/webdav/davcmds.py
U Zope/trunk/utilities/reindex_catalog.py
-=-
Modified: Zope/trunk/doc/DEBUGGING.txt
===================================================================
--- Zope/trunk/doc/DEBUGGING.txt 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/doc/DEBUGGING.txt 2005-03-28 16:34:11 UTC (rev 29694)
@@ -73,4 +73,5 @@
To commit changes you make, before exiting, you may have to do
another bit of magic:
- >>> get_transaction().commit()
+ >>> import transaction
+ >>> transaction.commit()
Modified: Zope/trunk/doc/HISTORY.txt
===================================================================
--- Zope/trunk/doc/HISTORY.txt 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/doc/HISTORY.txt 2005-03-28 16:34:11 UTC (rev 29694)
@@ -660,7 +660,7 @@
has executed, it has the same effect as the "old" behavior inasmuch
as no inconsistent state will ever be committed to the database
as a result of this behavior unless someone really wants to shoot
- themselves by calling "get_transaction().commit()" during error
+ themselves by calling "transaction.commit()" during error
handling code.
- TransientObjects (session data objects) may have lost state at
@@ -6538,7 +6538,7 @@
- Subtransactions have been added (instead of temporary
versions). If a true argument is given in a transaction commit
- or abort call (e.g. 'get_transaction().commit(1)'), then
+ or abort call (e.g. 'transaction.commit(1)'), then
the commit or abort applies to a subtransaction of the
current transaction. This is useful in a number of ways,
including:
Modified: Zope/trunk/doc/UNITTEST.txt
===================================================================
--- Zope/trunk/doc/UNITTEST.txt 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/doc/UNITTEST.txt 2005-03-28 16:34:11 UTC (rev 29694)
@@ -221,7 +221,7 @@
app.acl_users.manage_addUser(<parameters>)
- a transaction will not be committed to the Zope object database
- until you call the global function "get_transaction().commit()",
+ until you call "transaction.commit()",
so changes made to the ZODB are not visible to succeeding tests
unless that function is called explicitly.
Modified: Zope/trunk/lib/python/AccessControl/tests/testBindings.py
===================================================================
--- Zope/trunk/lib/python/AccessControl/tests/testBindings.py 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/AccessControl/tests/testBindings.py 2005-03-28 16:34:11 UTC (rev 29694)
@@ -104,7 +104,7 @@
from Testing.ZODButil import cleanDB
from AccessControl.SecurityManagement import noSecurityManager
noSecurityManager()
- get_transaction().abort()
+ transaction.abort()
self.connection.close()
self.db.close()
cleanDB()
Modified: Zope/trunk/lib/python/AccessControl/tests/testUserFolder.py
===================================================================
--- Zope/trunk/lib/python/AccessControl/tests/testUserFolder.py 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/AccessControl/tests/testUserFolder.py 2005-03-28 16:34:11 UTC (rev 29694)
@@ -57,7 +57,7 @@
def tearDown(self):
noSecurityManager()
- get_transaction().abort()
+ transaction.abort()
self.app._p_jar.close()
def login(self, name):
Modified: Zope/trunk/lib/python/App/Product.py
===================================================================
--- Zope/trunk/lib/python/App/Product.py 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/App/Product.py 2005-03-28 16:34:11 UTC (rev 29694)
@@ -38,6 +38,8 @@
from cgi import escape
from urllib import quote
+import transaction
+
import Globals, OFS.Folder, OFS.SimpleItem, Acquisition, Products
import ZClasses, AccessControl.Owned
from OFS.Folder import Folder
@@ -580,7 +582,7 @@
'help': ('OFSP','Product_Refresh.stx')},)
if not doInstall():
- get_transaction().abort()
+ transaction.abort()
return product
# Give the ZClass fixup code in Application
Modified: Zope/trunk/lib/python/App/RefreshFuncs.py
===================================================================
--- Zope/trunk/lib/python/App/RefreshFuncs.py 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/App/RefreshFuncs.py 2005-03-28 16:34:11 UTC (rev 29694)
@@ -320,7 +320,7 @@
finishAutoRefresh(jar, auto_refresh_ids)
from ZODB import Connection
Connection.resetCaches()
- get_transaction().commit()
+ transaction.commit()
jar._resetCache()
transaction.begin()
Modified: Zope/trunk/lib/python/App/Undo.py
===================================================================
--- Zope/trunk/lib/python/App/Undo.py 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/App/Undo.py 2005-03-28 16:34:11 UTC (rev 29694)
@@ -19,6 +19,7 @@
from DateTime import DateTime
import Globals, ExtensionClass
from ZopeUndo.Prefix import Prefix
+import transaction
class UndoSupport(ExtensionClass.Base):
@@ -123,7 +124,7 @@
for tid in transaction_info:
tid=tid.split()
if tid:
- get_transaction().note("Undo %s" % ''.join(tid[1:]))
+ transaction.get().note("Undo %s" % ''.join(tid[1:]))
tid=decode64(tid[0])
undo(tid)
Modified: Zope/trunk/lib/python/OFS/Application.py
===================================================================
--- Zope/trunk/lib/python/OFS/Application.py 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/OFS/Application.py 2005-03-28 16:34:11 UTC (rev 29694)
@@ -35,6 +35,7 @@
from Acquisition import aq_base
from App.Product import doInstall
from App.config import getConfiguration
+import transaction
class Application(Globals.ApplicationDefaultPermissions,
ZDOM.Root, Folder.Folder,
@@ -82,7 +83,7 @@
cpl=ApplicationManager()
cpl._init()
self._setObject('Control_Panel', cpl)
- get_transaction().note("Created Zope Application")
+ transaction.get().note("Created Zope Application")
def id(self):
try: return self.REQUEST['SCRIPT_NAME'][1:]
@@ -289,8 +290,8 @@
return self.app[0]
def commit(self, note):
- get_transaction().note(note)
- get_transaction().commit()
+ transaction.get().note(note)
+ transaction.commit()
def initialize(self):
app = self.getApp()
@@ -533,13 +534,13 @@
did_fixups=1
LOG('Zope', INFO,
'The global ZClass registry has successfully been rebuilt.')
- get_transaction().note('Rebuilt global product registry')
- get_transaction().commit()
+ transaction.get().note('Rebuilt global product registry')
+ transaction.commit()
except:
bad_things=1
LOG('Zope', ERROR, 'The attempt to rebuild the registry failed.',
error=sys.exc_info())
- get_transaction().abort()
+ transaction.abort()
# Now we need to see if any (disk-based) products were installed
# during intialization. If so (and the registry has no errors),
@@ -566,7 +567,7 @@
('Attempt to fixup ZClass dependencies after '
'detecting an updated disk-based product failed.'),
error=sys.exc_info())
- get_transaction().abort()
+ transaction.abort()
def install_products(self):
app = self.getApp()
@@ -588,8 +589,8 @@
debug_mode = App.config.getConfiguration().debug_mode
- get_transaction().note('Prior to product installs')
- get_transaction().commit()
+ transaction.get().note('Prior to product installs')
+ transaction.commit()
products = get_products()
@@ -799,16 +800,16 @@
list(Folder.Folder.__ac_permissions__)+new_permissions)
if not doInstall():
- get_transaction().abort()
+ transaction().abort()
else:
- get_transaction().note('Installed product '+product_name)
- get_transaction().commit()
+ transaction.get().note('Installed product '+product_name)
+ transaction.commit()
except:
if log_exc:
LOG('Zope',ERROR,'Couldn\'t install %s' % product_name,
error=sys.exc_info())
- get_transaction().abort()
+ transaction.abort()
if raise_exc:
raise
@@ -845,15 +846,15 @@
#setattr(Application, fn, ob)
if wrote:
app._standard_objects_have_been_added = 1
- get_transaction().note('Installed standard objects')
- get_transaction().commit()
+ transaction.get().note('Installed standard objects')
+ transaction.commit()
def reinstall_product(app, product_name):
folder_permissions = get_folder_permissions()
meta_types=[]
- get_transaction().note('Prior to product reinstall')
- get_transaction().commit()
+ transaction.get().note('Prior to product reinstall')
+ transaction.commit()
for product_dir in Products.__path__:
product_names=os.listdir(product_dir)
Modified: Zope/trunk/lib/python/OFS/CopySupport.py
===================================================================
--- Zope/trunk/lib/python/OFS/CopySupport.py 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/OFS/CopySupport.py 2005-03-28 16:34:11 UTC (rev 29694)
@@ -27,6 +27,8 @@
from webdav.Lockable import ResourceLockedError
from cgi import escape
+import transaction
+
CopyError='Copy Error'
copy_re = re.compile('^copy([0-9]*)_of_(.*)')
@@ -443,7 +445,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
- get_transaction().commit(1)
+ transaction.commit(1)
if self._p_jar is None:
raise CopyError, (
Modified: Zope/trunk/lib/python/OFS/Image.py
===================================================================
--- Zope/trunk/lib/python/OFS/Image.py 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/OFS/Image.py 2005-03-28 16:34:11 UTC (rev 29694)
@@ -34,6 +34,7 @@
from ZPublisher.Iterators import filestream_iterator
from zExceptions import Redirect
from cgi import escape
+import transaction
StringType=type('')
manage_addFileForm=DTMLFile('dtml/imageAdd', globals(),Kind='File',kind='file')
@@ -509,7 +510,7 @@
# Make sure we have an _p_jar, even if we are a new object, by
# doing a sub-transaction commit.
- get_transaction().commit(1)
+ transaction.commit(1)
if self._p_jar is None:
# Ugh
@@ -535,7 +536,7 @@
data.next = next
# Save the object so that we can release its memory.
- get_transaction().commit(1)
+ transaction.commit(1)
data._p_deactivate()
# The object should be assigned an oid and be a ghost.
assert data._p_oid is not None
Modified: Zope/trunk/lib/python/OFS/tests/testCopySupport.py
===================================================================
--- Zope/trunk/lib/python/OFS/tests/testCopySupport.py 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/OFS/tests/testCopySupport.py 2005-03-28 16:34:11 UTC (rev 29694)
@@ -87,7 +87,7 @@
# Hack, we need a _p_mtime for the file, so we make sure that it
# has one. We use a subtransaction, which means we can rollback
# later and pretend we didn't touch the ZODB.
- get_transaction().commit()
+ transaction.commit()
except:
self.connection.close()
raise
@@ -97,7 +97,7 @@
def _cleanApp( self ):
- get_transaction().abort()
+ transaction.abort()
self.app._p_jar.sync()
self.connection.close()
del self.app
Modified: Zope/trunk/lib/python/OFS/tests/testFileAndImage.py
===================================================================
--- Zope/trunk/lib/python/OFS/tests/testFileAndImage.py 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/OFS/tests/testFileAndImage.py 2005-03-28 16:34:11 UTC (rev 29694)
@@ -100,7 +100,7 @@
setattr(self.app, ZCM_MANAGERS, ('dcm',))
# Hack, we need a _p_mtime for the file, so we make sure that it
# has one.
- get_transaction().commit()
+ transaction.commit()
except:
self.connection.close()
raise
@@ -109,7 +109,7 @@
def tearDown( self ):
del self.file
- get_transaction().abort()
+ transaction.abort()
self.connection.close()
del self.app
del self.responseOut
Modified: Zope/trunk/lib/python/OFS/tests/testRanges.py
===================================================================
--- Zope/trunk/lib/python/OFS/tests/testRanges.py 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/OFS/tests/testRanges.py 2005-03-28 16:34:11 UTC (rev 29694)
@@ -14,6 +14,7 @@
import string, random, cStringIO, time, re
import ZODB
+import transaction
from OFS.Application import Application
from OFS.Folder import manage_addFolder
from OFS.Image import manage_addFile
@@ -73,7 +74,7 @@
# Hack, we need a _p_mtime for the file, so we make sure that it
# has one. We use a subtransaction, which means we can rollback
# later and pretend we didn't touch the ZODB.
- get_transaction().commit()
+ transaction.commit()
except:
self.connection.close()
raise
@@ -81,7 +82,7 @@
def tearDown(self):
try: self.app._delObject(TESTFOLDER_NAME)
except AttributeError: pass
- get_transaction().abort()
+ transaction.abort()
self.app._p_jar.sync()
self.connection.close()
self.app = None
Modified: Zope/trunk/lib/python/OFS/tests/testTraverse.py
===================================================================
--- Zope/trunk/lib/python/OFS/tests/testTraverse.py 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/OFS/tests/testTraverse.py 2005-03-28 16:34:11 UTC (rev 29694)
@@ -16,6 +16,7 @@
import string, cStringIO, re
import ZODB, Acquisition, transaction
+import transaction
from Acquisition import aq_base
from OFS.Application import Application
from OFS.Folder import manage_addFolder
@@ -137,7 +138,7 @@
# Hack, we need a _p_mtime for the file, so we make sure that it
# has one. We use a subtransaction, which means we can rollback
# later and pretend we didn't touch the ZODB.
- get_transaction().commit()
+ transaction.commit()
except:
self.connection.close()
raise
@@ -154,7 +155,7 @@
del self.oldPolicy
del self.policy
del self.folder1
- get_transaction().abort()
+ transaction.abort()
self.app._p_jar.sync()
self.connection.close()
del self.app
Modified: Zope/trunk/lib/python/Products/OFSP/Version.py
===================================================================
--- Zope/trunk/lib/python/Products/OFSP/Version.py 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/Products/OFSP/Version.py 2005-03-28 16:34:11 UTC (rev 29694)
@@ -25,6 +25,8 @@
from OFS.ObjectManager import BeforeDeleteException
from cgi import escape
+import transaction
+
class VersionException(BeforeDeleteException): pass
manage_addVersionForm=Globals.DTMLFile('dtml/versionAdd', globals())
@@ -154,7 +156,7 @@
s=self.cookie
d=self._p_jar.getVersion()
if d==s: d=''
- get_transaction().note(remark)
+ transaction.get().note(remark)
db.commitVersion(s, d)
if REQUEST is not None:
@@ -168,7 +170,7 @@
Globals.VersionBase[self.cookie].abort()
else:
# ZODB 3
- get_transaction().note(remark)
+ transaction.get().note(remark)
db.abortVersion(self.cookie)
if REQUEST is not None:
Modified: Zope/trunk/lib/python/Products/PageTemplates/tests/testZopePageTemplate.py
===================================================================
--- Zope/trunk/lib/python/Products/PageTemplates/tests/testZopePageTemplate.py 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/Products/PageTemplates/tests/testZopePageTemplate.py 2005-03-28 16:34:11 UTC (rev 29694)
@@ -24,7 +24,7 @@
self.text = 'text of page template'
def tearDown(self):
- get_transaction().abort()
+ transaction.abort()
self.app._p_jar.close()
def testAddWithParams(self):
Modified: Zope/trunk/lib/python/Products/PluginIndexes/TextIndex/tests/testTextIndex.py
===================================================================
--- Zope/trunk/lib/python/Products/PluginIndexes/TextIndex/tests/testTextIndex.py 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/Products/PluginIndexes/TextIndex/tests/testTextIndex.py 2005-03-28 16:34:11 UTC (rev 29694)
@@ -21,6 +21,8 @@
import ZODB
from ZODB.MappingStorage import MappingStorage
+import transaction
+
from Products.PluginIndexes.TextIndex import TextIndex
from Products.PluginIndexes.TextIndex import GlobbingLexicon
@@ -61,7 +63,7 @@
self.jar = jar
if not jar.root().has_key('index'):
jar.root()['index'] = TextIndex.TextIndex('text')
- get_transaction().commit()
+ transaction.commit()
return jar.root()['index']
def dbclose(self):
@@ -69,7 +71,7 @@
self.jar = None
def tearDown(self):
- get_transaction().abort()
+ transaction.abort()
if self.jar is not None:
self.dbclose()
if self.db is not None:
@@ -90,11 +92,11 @@
self.doc.text='this is the time, when all good zopes'
index.index_object(0, self.doc)
- get_transaction().commit()
+ transaction.commit()
self.doc.text='time waits for no one'
index.index_object(1, self.doc)
- get_transaction().commit()
+ transaction.commit()
self.dbclose()
index=self.dbopen()
@@ -116,19 +118,19 @@
self.doc.text='this is the time, when all good zopes'
index.index_object(0, self.doc)
- get_transaction().commit()
+ transaction.commit()
self.doc.text='time waits for no one'
index.index_object(1, self.doc)
- get_transaction().commit()
+ transaction.commit()
self.doc.text='the next task is to test'
index.index_object(3, self.doc)
- get_transaction().commit()
+ transaction.commit()
self.doc.text='time time'
index.index_object(2, self.doc)
- get_transaction().commit()
+ transaction.commit()
self.dbclose()
index=self.dbopen()
@@ -166,7 +168,7 @@
for i in range(len(self.sample_texts)):
self.doc.text=self.sample_texts[i]
index.index_object(i, self.doc)
- get_transaction().commit()
+ transaction.commit()
self.dbclose()
Modified: Zope/trunk/lib/python/Products/Sessions/stresstests/stresstestMultiThread.py
===================================================================
--- Zope/trunk/lib/python/Products/Sessions/stresstests/stresstestMultiThread.py 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/Products/Sessions/stresstests/stresstestMultiThread.py 2005-03-28 16:34:11 UTC (rev 29694)
@@ -16,6 +16,7 @@
#os.chdir('../../..')
from Testing import makerequest
import ZODB # in order to get Persistence.Persistent working
+import transaction
import Acquisition
from Acquisition import aq_base
from Products.Sessions.BrowserIdManager import BrowserIdManager, \
@@ -66,13 +67,13 @@
app = Application()
root['Application']= app
_populate(app)
- get_transaction().commit()
+ transaction.commit()
stuff['db'] = db
conn.close()
return db
def _delDB():
- get_transaction().abort()
+ transaction.abort()
del stuff['db']
class Foo(Acquisition.Implicit): pass
@@ -99,10 +100,10 @@
app._setObject(sdm_name, session_data_manager)
app._setObject(tf_name, tf)
- get_transaction().commit()
+ transaction.commit()
app.temp_folder._setObject(toc_name, toc)
- get_transaction().commit()
+ transaction.commit()
class TestMultiThread(TestCase):
def testOverlappingBrowserIds(self):
@@ -191,17 +192,17 @@
except ConflictError:
print "W",
except:
- get_transaction().abort()
+ transaction.abort()
print log_time()
traceback.print_exc()
raise
i = i + 1
- get_transaction().abort()
+ transaction.abort()
self.conn.close()
time.sleep(random.randrange(10) * .1)
finally:
- get_transaction().abort()
+ transaction.abort()
self.conn.close()
del self.app
self.finished = 1
@@ -217,11 +218,11 @@
data = session_data_manager.getSessionData(create=1)
t = time.time()
data[t] = 1
- get_transaction().commit()
+ transaction.commit()
for i in range(self.iters):
data = session_data_manager.getSessionData()
time.sleep(random.choice(range(3)))
- get_transaction().commit()
+ transaction.commit()
class WriterThread(BaseReaderWriter):
def run1(self):
@@ -232,9 +233,9 @@
n = random.choice(range(3))
time.sleep(n)
if n % 2 == 0:
- get_transaction().commit()
+ transaction.commit()
else:
- get_transaction().abort()
+ transaction.abort()
class ValuesGetterThread(BaseReaderWriter):
def run1(self):
@@ -245,9 +246,9 @@
n = random.choice(range(3))
time.sleep(n)
if n % 2 == 0:
- get_transaction().commit()
+ transaction.commit()
else:
- get_transaction().abort()
+ transaction.abort()
def test_suite():
Modified: Zope/trunk/lib/python/Products/Sessions/tests/testSessionDataManager.py
===================================================================
--- Zope/trunk/lib/python/Products/Sessions/tests/testSessionDataManager.py 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/Products/Sessions/tests/testSessionDataManager.py 2005-03-28 16:34:11 UTC (rev 29694)
@@ -16,6 +16,7 @@
import ZODB # in order to get Persistence.Persistent working
from ZODB.POSException import InvalidObjectReference, ConflictError
from ZODB.DemoStorage import DemoStorage
+import transaction
from OFS.DTMLMethod import DTMLMethod
import Acquisition
from Acquisition import aq_base
@@ -49,14 +50,14 @@
root = conn.root()
app = Application()
root['Application']= app
- get_transaction().commit(1)
+ transaction.commit(1)
_populate(app)
stuff['db'] = db
conn.close()
return db
def _delDB():
- get_transaction().abort()
+ transaction.abort()
del stuff['db']
class Foo(Acquisition.Implicit): pass
@@ -87,14 +88,14 @@
app._setObject(sdm_name, session_data_manager)
app._setObject(tf_name, tf)
- get_transaction().commit()
+ transaction.commit()
app.temp_folder._setObject(toc_name, toc)
- get_transaction().commit()
+ transaction.commit()
# index_html necessary for publishing emulation for testAutoReqPopulate
app._setObject('index_html', DTMLMethod('', __name__='foo'))
- get_transaction().commit()
+ transaction.commit()
class TestBase(TestCase):
def setUp(self):
@@ -177,17 +178,19 @@
def testGhostUnghostSessionManager(self):
sdm = self.app.session_data_manager
- get_transaction().commit()
+ transaction.commit()
sd = sdm.getSessionData()
sd.set('foo', 'bar')
sdm._p_changed = None
- get_transaction().commit()
+ transaction.commit()
self.failUnless(sdm.getSessionData().get('foo') == 'bar')
def testSubcommit(self):
sd = self.app.session_data_manager.getSessionData()
sd.set('foo', 'bar')
- self.failUnless(get_transaction().commit(1) == None)
+ # TODO: transaction.commit() always returns None. Is that
+ # all this is trying to test?
+ self.failUnless(transaction.commit(1) == None)
def testForeignObject(self):
self.assertRaises(InvalidObjectReference, self._foreignAdd)
@@ -201,7 +204,7 @@
# we want to fail for some other reason:
sd = self.app.session_data_manager.getSessionData()
sd.set('foo', ob)
- get_transaction().commit()
+ transaction.commit()
def testAqWrappedObjectsFail(self):
a = Foo()
@@ -209,7 +212,7 @@
aq_wrapped = a.__of__(b)
sd = self.app.session_data_manager.getSessionData()
sd.set('foo', aq_wrapped)
- self.assertRaises(TypeError, get_transaction().commit)
+ self.assertRaises(TypeError, transaction.commit)
def testAutoReqPopulate(self):
self.app.REQUEST['PARENTS'] = [self.app]
Modified: Zope/trunk/lib/python/Products/SiteAccess/Extensions/updata.py
===================================================================
--- Zope/trunk/lib/python/Products/SiteAccess/Extensions/updata.py 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/Products/SiteAccess/Extensions/updata.py 2005-03-28 16:34:11 UTC (rev 29694)
@@ -1,6 +1,7 @@
import Zope2
from ZPublisher.BeforeTraverse import NameCaller, rewriteBeforeTraverse
from Products.SiteAccess.AccessRule import AccessRule
+import transaction
def updata(self):
"""Convert SiteAccess objects from 1.x to 2.x"""
@@ -33,5 +34,5 @@
print "Converting SiteAccess objects from 1.x to 2.x ..."
app = Zope2.app()
_cvt_btr(app)
- get_transaction().commit()
+ transaction.commit()
print "Done."
Modified: Zope/trunk/lib/python/Products/SiteAccess/tests/testVirtualHostMonster.py
===================================================================
--- Zope/trunk/lib/python/Products/SiteAccess/tests/testVirtualHostMonster.py 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/Products/SiteAccess/tests/testVirtualHostMonster.py 2005-03-28 16:34:11 UTC (rev 29694)
@@ -36,7 +36,7 @@
self.tearDown()
def tearDown(self):
- get_transaction().abort()
+ transaction.abort()
self.app._p_jar.close()
def testAbsoluteUrl(self):
Modified: Zope/trunk/lib/python/Products/SiteErrorLog/tests/testSiteErrorLog.py
===================================================================
--- Zope/trunk/lib/python/Products/SiteErrorLog/tests/testSiteErrorLog.py 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/Products/SiteErrorLog/tests/testSiteErrorLog.py 2005-03-28 16:34:11 UTC (rev 29694)
@@ -27,7 +27,7 @@
self.tearDown()
def tearDown(self):
- get_transaction().abort()
+ transaction.abort()
self.app._p_jar.close()
def testInstantiation(self):
Modified: Zope/trunk/lib/python/Products/TemporaryFolder/patchfs.py
===================================================================
--- Zope/trunk/lib/python/Products/TemporaryFolder/patchfs.py 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/Products/TemporaryFolder/patchfs.py 2005-03-28 16:34:11 UTC (rev 29694)
@@ -16,6 +16,8 @@
import ZODB
import Globals
from ZODB import FileStorage, DB
+import transaction
+
import Products.Sessions.BrowserIdManager
import Products.Sessions.SessionDataManager
import Products.TemporaryFolder.TemporaryFolder
@@ -45,4 +47,4 @@
app._setObject('session_data_manager', sdm)
app._p_changed = 1
-get_transaction().commit()
+transaction.commit()
Modified: Zope/trunk/lib/python/Products/Transience/tests/testTimeoutRelated.py
===================================================================
--- Zope/trunk/lib/python/Products/Transience/tests/testTimeoutRelated.py 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/Products/Transience/tests/testTimeoutRelated.py 2005-03-28 16:34:11 UTC (rev 29694)
@@ -5,6 +5,7 @@
sys.path.insert(0, '../../..')
import ZODB # in order to get Persistence.Persistent working
+import transaction
from Testing import makerequest
import Acquisition
from Acquisition import aq_base
@@ -34,7 +35,7 @@
root = conn.root()
app = Application()
root['Application']= app
- get_transaction().commit()
+ transaction.commit()
stuff['app'] = app
stuff['conn'] = conn
stuff['db'] = db
@@ -47,7 +48,7 @@
return conn, app
def _delApp():
- get_transaction().abort()
+ transaction.abort()
stuff['conn'].close()
del stuff['conn']
del stuff['app']
@@ -68,7 +69,7 @@
self.app._setObject('sm', sm)
def tearDown(self):
- get_transaction().abort()
+ transaction.abort()
_delApp()
del self.app
Products.Transience.Transience.time = oldtime
Modified: Zope/trunk/lib/python/Products/Transience/tests/testTransactionHelper.py
===================================================================
--- Zope/trunk/lib/python/Products/Transience/tests/testTransactionHelper.py 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/Products/Transience/tests/testTransactionHelper.py 2005-03-28 16:34:11 UTC (rev 29694)
@@ -23,14 +23,14 @@
class TestTransactionHelper(TestCase):
def setUp(self):
- self.t = get_transaction()
+ self.t = transaction.get()
def tearDown(self):
self.t = None
def testUncommittable(self):
makeTransactionUncommittable(self.t, "test")
- self.assertRaises(PreventTransactionCommit, get_transaction().commit)
+ self.assertRaises(PreventTransactionCommit, transaction.commit)
transaction.abort()
def test_suite():
Modified: Zope/trunk/lib/python/Products/ZCTextIndex/tests/indexhtml.py
===================================================================
--- Zope/trunk/lib/python/Products/ZCTextIndex/tests/indexhtml.py 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/Products/ZCTextIndex/tests/indexhtml.py 2005-03-28 16:34:11 UTC (rev 29694)
@@ -16,6 +16,7 @@
import ZODB
from ZODB.FileStorage import FileStorage
from BTrees.IOBTree import IOBTree
+import transaction
from Products.ZCTextIndex.ZCTextIndex import ZCTextIndex
from Products.ZCTextIndex.HTMLSplitter import HTMLWordSplitter
@@ -58,7 +59,7 @@
def main(db, root, dir):
rt["index"] = index = INDEX()
rt["files"] = paths = IOBTree()
- get_transaction().commit()
+ transaction.commit()
zodb_time = 0.0
pack_time = 0.0
@@ -83,7 +84,7 @@
f.close()
if docid % TXN_INTERVAL == 0:
z0 = clock()
- get_transaction().commit()
+ transaction.commit()
z1 = clock()
zodb_time += z1 - z0
if VERBOSE:
@@ -97,7 +98,7 @@
if VERBOSE:
print "pack took", p1 - p0, pack_time
z0 = clock()
- get_transaction().commit()
+ transaction.commit()
z1 = t1 = clock()
total_time = t1 - t0
zodb_time += z1 - z0
Modified: Zope/trunk/lib/python/Products/ZCTextIndex/tests/mailtest.py
===================================================================
--- Zope/trunk/lib/python/Products/ZCTextIndex/tests/mailtest.py 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/Products/ZCTextIndex/tests/mailtest.py 2005-03-28 16:34:11 UTC (rev 29694)
@@ -42,6 +42,7 @@
import ZODB
import ZODB.FileStorage
+import transaction
from Products.ZCTextIndex.Lexicon import \
Lexicon, CaseNormalizer, Splitter, StopWordRemover
from Products.ZCTextIndex.ZCTextIndex import ZCTextIndex
@@ -92,7 +93,7 @@
rt["documents"] = docs = IOBTree()
else:
docs = None
- get_transaction().commit()
+ transaction.commit()
mbox = mailbox.UnixMailbox(open(mboxfile, 'rb'))
if VERBOSE:
@@ -107,7 +108,7 @@
idx_time += itime
pack_time += ptime
- get_transaction().commit()
+ transaction.commit()
if PACK_INTERVAL and i % PACK_INTERVAL != 0:
if VERBOSE >= 2:
@@ -148,7 +149,7 @@
if not EXCLUDE_TEXT:
docs[i] = msg
if i % TXN_SIZE == 0:
- get_transaction().commit()
+ transaction.commit()
i1 = time.clock()
idx_time += i1 - i0
if VERBOSE and i % 50 == 0:
Modified: Zope/trunk/lib/python/Products/ZCTextIndex/tests/mhindex.py
===================================================================
--- Zope/trunk/lib/python/Products/ZCTextIndex/tests/mhindex.py 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/Products/ZCTextIndex/tests/mhindex.py 2005-03-28 16:34:11 UTC (rev 29694)
@@ -51,6 +51,7 @@
from BTrees.IOBTree import IOBTree
from BTrees.OIBTree import OIBTree
from BTrees.IIBTree import IIBTree
+import transaction
from Products.ZCTextIndex.NBest import NBest
from Products.ZCTextIndex.OkapiIndex import OkapiIndex
@@ -552,7 +553,7 @@
def commit(self):
if self.trans_count > 0:
print "committing..."
- get_transaction().commit()
+ transaction.commit()
self.trans_count = 0
self.pack_count += 1
if self.pack_count >= self.pack_limit > 0:
Modified: Zope/trunk/lib/python/Products/ZCTextIndex/tests/testIndex.py
===================================================================
--- Zope/trunk/lib/python/Products/ZCTextIndex/tests/testIndex.py 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/Products/ZCTextIndex/tests/testIndex.py 2005-03-28 16:34:11 UTC (rev 29694)
@@ -15,6 +15,8 @@
import os
from unittest import TestCase, TestSuite, main, makeSuite
+import transaction
+
from BTrees.Length import Length
from Products.ZCTextIndex.Lexicon import Lexicon, Splitter
from Products.ZCTextIndex.CosineIndex import CosineIndex
@@ -178,7 +180,7 @@
self.openDB()
r1 = self.db.open().root()
r1['i'] = self.index
- get_transaction().commit()
+ transaction.commit()
r2 = self.db.open().root()
copy = r2['i']
@@ -192,10 +194,10 @@
self.assertEqual(self.index._p_serial, copy._p_serial)
self.index.index_doc(0, 'The time has come')
- get_transaction().commit()
+ transaction.commit()
copy.index_doc(1, 'That time has gone')
- get_transaction().commit()
+ transaction.commit()
def test_reindex_doc_conflict(self):
self.index = OkapiIndex(Lexicon())
@@ -204,7 +206,7 @@
self.openDB()
r1 = self.db.open().root()
r1['i'] = self.index
- get_transaction().commit()
+ transaction.commit()
r2 = self.db.open().root()
copy = r2['i']
@@ -218,10 +220,10 @@
self.assertEqual(self.index._p_serial, copy._p_serial)
self.index.index_doc(0, 'Sometimes change isn\'t bad')
- get_transaction().commit()
+ transaction.commit()
copy.index_doc(1, 'Then again, who asked you?')
- get_transaction().commit()
+ transaction.commit()
class TestUpgrade(TestCase):
Modified: Zope/trunk/lib/python/Products/ZCTextIndex/tests/testLexicon.py
===================================================================
--- Zope/trunk/lib/python/Products/ZCTextIndex/tests/testLexicon.py 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/Products/ZCTextIndex/tests/testLexicon.py 2005-03-28 16:34:11 UTC (rev 29694)
@@ -16,6 +16,7 @@
from unittest import TestCase, TestSuite, main, makeSuite
import ZODB
+import transaction
from Products.ZCTextIndex.Lexicon import Lexicon
from Products.ZCTextIndex.Lexicon import Splitter, CaseNormalizer
@@ -165,7 +166,7 @@
self.openDB()
r1 = self.db.open().root()
r1['l'] = self.l
- get_transaction().commit()
+ transaction.commit()
r2 = self.db.open().root()
copy = r2['l']
@@ -177,11 +178,11 @@
self.assertEqual(self.l._p_serial, copy._p_serial)
self.l.sourceToWordIds('mary had a little lamb')
- get_transaction().commit()
+ transaction.commit()
copy.sourceToWordIds('whose fleece was')
copy.sourceToWordIds('white as snow')
- get_transaction().commit()
+ transaction.commit()
self.assertEqual(copy.length(), 11)
self.assertEqual(copy.length(), len(copy._words))
Modified: Zope/trunk/lib/python/Products/ZCatalog/README.txt
===================================================================
--- Zope/trunk/lib/python/Products/ZCatalog/README.txt 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/Products/ZCatalog/README.txt 2005-03-28 16:34:11 UTC (rev 29694)
@@ -80,7 +80,8 @@
> cat.refreshCatalog(pghandler=ZLogHandler())
>
> # Don't forget to commit
- > get_transaction().commit()
+ > import transaction
+ > transaction.commit()
The constructor of the handler can be given an optional parameter
Modified: Zope/trunk/lib/python/Products/ZCatalog/ZCatalog.py
===================================================================
--- Zope/trunk/lib/python/Products/ZCatalog/ZCatalog.py 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/Products/ZCatalog/ZCatalog.py 2005-03-28 16:34:11 UTC (rev 29694)
@@ -35,6 +35,7 @@
manage_zcatalog_entries, manage_zcatalog_indexes, search_zcatalog
from ZCatalogIndexes import ZCatalogIndexes
from ZODB.POSException import ConflictError
+import transaction
from Products.PluginIndexes.common.PluggableIndex \
import PluggableIndexInterface
from Products.PluginIndexes.TextIndex import Splitter
@@ -566,7 +567,7 @@
if self.threshold is not None:
# figure out whether or not to commit a subtransaction.
- t = id(get_transaction())
+ t = id(transaction.get())
if t != self._v_transaction:
self._v_total = 0
self._v_transaction = t
@@ -581,7 +582,7 @@
# we should commit a subtransaction if our threshhold is
# exceeded within the boundaries of the current transaction.
if self._v_total > self.threshold:
- get_transaction().commit(1)
+ transaction.commit(1)
self._p_jar.cacheGC()
self._v_total = 0
if pghandler:
Modified: Zope/trunk/lib/python/Products/ZCatalog/regressiontests/loadmail.py
===================================================================
--- Zope/trunk/lib/python/Products/ZCatalog/regressiontests/loadmail.py 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/Products/ZCatalog/regressiontests/loadmail.py 2005-03-28 16:34:11 UTC (rev 29694)
@@ -122,6 +122,8 @@
from string import strip, find, split, lower, atoi
from urllib import quote
+import transaction
+
VERBOSE = 0
def do(db, f, args, returnf=None):
@@ -192,7 +194,7 @@
sys.stdout.write(fmt % (i, f.tell()))
sys.stdout.flush()
if i and (i%5000 == 0):
- get_transaction().commit()
+ transaction.commit()
dest._p_jar._cache.minimize()
loadmessage(dest, message, i)
@@ -201,7 +203,7 @@
dest.number_of_messages=i
print
- get_transaction().commit()
+ transaction.commit()
def loadinc(name, mb, f, max=99999999, wait=1):
from ZODB.POSException import ConflictError
@@ -236,17 +238,17 @@
except ConflictError, v:
# print v.args
rconflicts=rconflicts+1
- get_transaction().abort()
+ transaction.abort()
else:
try:
- get_transaction().commit()
+ transaction.commit()
i=i+1
message=mb.next()
body=message.fp.read()
headers=list(message.headers)
except ConflictError:
wconflicts=wconflicts+1
- get_transaction().abort()
+ transaction.abort()
doc=app=mdest=0
jar.close()
@@ -276,7 +278,7 @@
r=RE()
r.PARENTS=[0, app.mail]
app.cat.manage_catalogFoundItems(r,r,'','',['DTML Document'])
- get_transaction().commit()
+ transaction.commit()
def index():
os.environ['STUPID_LOG_FILE']=''
@@ -306,7 +308,7 @@
app.cat.addIndex('PrincipiaSearchSource', 'ZCTextIndex', extra)
- get_transaction().commit()
+ transaction.commit()
system = AccessControl.SpecialUsers.system
AccessControl.SecurityManagement.newSecurityManager(None, system)
r=RE()
@@ -325,7 +327,7 @@
else:
Products.BTreeFolder.BTreeFolder.manage_addBTreeFolder(app, n)
- get_transaction().commit()
+ transaction.commit()
app._p_jar.close()
def hist(n):
@@ -409,7 +411,7 @@
mem = VmSize()
del app.cat
- get_transaction().commit()
+ transaction.commit()
t = time.time() - t
c = time.clock() - c
@@ -635,14 +637,14 @@
except ConflictError, v:
#print v.args
rconflicts=rconflicts+1
- get_transaction().abort()
+ transaction.abort()
else:
try:
- get_transaction().commit()
+ transaction.commit()
did=str(edits.pop())
except ConflictError:
wconflicts=wconflicts+1
- get_transaction().abort()
+ transaction.abort()
doc=app=0
jar.close()
Modified: Zope/trunk/lib/python/Products/ZCatalog/regressiontests/regressionCatalog.py
===================================================================
--- Zope/trunk/lib/python/Products/ZCatalog/regressiontests/regressionCatalog.py 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/Products/ZCatalog/regressiontests/regressionCatalog.py 2005-03-28 16:34:11 UTC (rev 29694)
@@ -18,6 +18,8 @@
import Zope2
import ZODB, ZODB.FileStorage
+import transaction
+
from Products.ZCatalog import ZCatalog,Vocabulary
from Products.ZCatalog.Catalog import CatalogError
import Persistence
@@ -68,7 +70,7 @@
def write(self,name,obj):
self.root[name] = obj
- get_transaction().commit()
+ transaction.commit()
def read(self,name):
@@ -462,7 +464,7 @@
cat.uncatalog_object(mid)
if kw.get("commit",1)==1:
- get_transaction().commit()
+ transaction.commit()
time.sleep(0.1)
except ZODB.POSException.ConflictError:
uncat_conflicts = uncat_conflicts + 1
@@ -471,14 +473,14 @@
cat.catalog_object(obj,mid)
if kw.get("commit",1)==1:
- get_transaction().commit()
+ transaction.commit()
time.sleep(0.1)
except ZODB.POSException.ConflictError:
cat_conflicts = cat_conflicts + 1
try:
- get_transaction().commit()
+ transaction.commit()
except: pass
@@ -551,7 +553,7 @@
try:
cat.catalogObject(obj,mid)
- get_transaction().commit()
+ transaction.commit()
except:
cat_conflicts = cat_conflicts + 1
Modified: Zope/trunk/lib/python/Products/ZCatalog/regressiontests/regressionCatalogTiming.py
===================================================================
--- Zope/trunk/lib/python/Products/ZCatalog/regressiontests/regressionCatalogTiming.py 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/Products/ZCatalog/regressiontests/regressionCatalogTiming.py 2005-03-28 16:34:11 UTC (rev 29694)
@@ -25,6 +25,8 @@
from unittest import TestCase, TestSuite, JUnitTextTestRunner,\
VerboseTextTestRunner, makeSuite
+import transaction
+
from Products.PluginIndexes.FieldIndex.FieldIndex import FieldIndex
from Products.PluginIndexes.TextIndex.TextIndex import TextIndex
from Products.PluginIndexes.TextIndex.Lexicon import Lexicon
@@ -68,7 +70,7 @@
t = time.time()
loadmail(self.app.catalogtest, 'zopemail',
os.path.join(here, 'zope.mbox'), 500)
- get_transaction().commit()
+ transaction.commit()
loadtime = time.time() - t
out("loading data took %s seconds.. " % loadtime)
t = time.time()
@@ -92,7 +94,7 @@
max = 500
m = loadmail(self.app.catalogtest, 'zopemail',
os.path.join(here, 'zope.mbox'), max, c)
- get_transaction().commit()
+ transaction.commit()
total = time.time() - t
out("total time for load and index was %s seconds.. " % total)
t = time.time()
@@ -118,11 +120,11 @@
self.setUp()
c = self.app.catalogtest.catalog
c.threshold = x
- get_transaction().commit()
+ transaction.commit()
t = time.time()
loadmail(self.app.catalogtest, 'zopemail',
os.path.join(here, 'zope.mbox'), 500, c)
- get_transaction().commit()
+ transaction.commit()
total = time.time() - t
out("total time with subcommit thresh %s was %s seconds.. "
% (x,total))
Modified: Zope/trunk/lib/python/Products/ZCatalog/tests/testCatalog.py
===================================================================
--- Zope/trunk/lib/python/Products/ZCatalog/tests/testCatalog.py 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/Products/ZCatalog/tests/testCatalog.py 2005-03-28 16:34:11 UTC (rev 29694)
@@ -34,6 +34,7 @@
from Products.ZCatalog.Catalog import CatalogError
from ZODB.DB import DB
from ZODB.DemoStorage import DemoStorage
+import transaction
from Products.PluginIndexes.FieldIndex.FieldIndex import FieldIndex
from Products.PluginIndexes.KeywordIndex.KeywordIndex import KeywordIndex
@@ -52,7 +53,7 @@
root = conn.root()
app = OFS.Application.Application()
root['Application'] = app
- get_transaction().commit()
+ transaction.commit()
# Init products
#OFS.Application.initialize(app)
Modified: Zope/trunk/lib/python/Products/ZODBMountPoint/MountedObject.py
===================================================================
--- Zope/trunk/lib/python/Products/ZODBMountPoint/MountedObject.py 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/Products/ZODBMountPoint/MountedObject.py 2005-03-28 16:34:11 UTC (rev 29694)
@@ -18,6 +18,8 @@
import os
+import transaction
+
import Globals
from Acquisition import aq_base, aq_inner, aq_parent
from AccessControl.ZopeGuards import guarded_getattr
@@ -52,7 +54,7 @@
o = context.restrictedTraverse(id)
# Commit a subtransaction to assign the new object to
# the correct database.
- get_transaction().commit(1)
+ transaction.commit(1)
return o
def traverseOrConstruct(self, path, omit_final=0):
@@ -105,7 +107,7 @@
obj = context.unrestrictedTraverse(id)
# Commit a subtransaction to assign the new object to
# the correct database.
- get_transaction().commit(1)
+ transaction.commit(1)
return obj
@@ -171,7 +173,7 @@
obj = Application()
root[real_root] = obj
# Get it into the database
- get_transaction().commit(1)
+ transaction.commit(1)
else:
raise
Modified: Zope/trunk/lib/python/Products/ZODBMountPoint/tests/testMountPoint.py
===================================================================
--- Zope/trunk/lib/python/Products/ZODBMountPoint/tests/testMountPoint.py 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/Products/ZODBMountPoint/tests/testMountPoint.py 2005-03-28 16:34:11 UTC (rev 29694)
@@ -19,6 +19,7 @@
import unittest
import Testing
import ZODB
+import transaction
from OFS.Application import Application
from OFS.Folder import Folder
import App.config
@@ -94,15 +95,15 @@
root = conn.root()
root['Application'] = app = Application()
self.app = app
- get_transaction().commit() # Get app._p_jar set
+ transaction.commit() # Get app._p_jar set
manage_addMounts(app, ('/mount1', '/mount2'))
- get_transaction().commit() # Get the mount points ready
+ transaction.commit() # Get the mount points ready
def tearDown(self):
App.config.setConfiguration(original_config)
- get_transaction().abort()
+ transaction.abort()
self.app._p_jar.close()
del self.app
del self.db
@@ -123,7 +124,7 @@
self.assertEqual(app.mount1._p_changed, 1)
self.assertEqual(app.mount2._p_changed, 1)
self.assertEqual(app._p_changed, 1)
- get_transaction().commit()
+ transaction.commit()
self.assertEqual(app.mount1._p_changed, 0)
self.assertEqual(app.mount2._p_changed, 0)
self.assertEqual(app._p_changed, 0)
@@ -173,7 +174,7 @@
self.app.mount2 = Folder()
self.app.mount2.id = 'mount2'
self.assert_(getMountPoint(self.app.mount2) is None)
- get_transaction().commit()
+ transaction.commit()
self.assert_(getMountPoint(self.app.mount2) is None)
Modified: Zope/trunk/lib/python/Shared/DC/ZRDB/THUNK.py
===================================================================
--- Zope/trunk/lib/python/Shared/DC/ZRDB/THUNK.py 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/Shared/DC/ZRDB/THUNK.py 2005-03-28 16:34:11 UTC (rev 29694)
@@ -13,6 +13,8 @@
import TM, ThreadLock
from TM import Surrogate
+import transaction
+
thunk_lock=ThreadLock.allocate_lock()
class THUNKED_TM(TM.TM):
@@ -23,7 +25,7 @@
if not self._registered:
thunk_lock.acquire()
try:
- get_transaction().register(Surrogate(self))
+ transaction.get().register(Surrogate(self))
self._begin()
except:
thunk_lock.release()
Modified: Zope/trunk/lib/python/Shared/DC/ZRDB/TM.py
===================================================================
--- Zope/trunk/lib/python/Shared/DC/ZRDB/TM.py 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/Shared/DC/ZRDB/TM.py 2005-03-28 16:34:11 UTC (rev 29694)
@@ -13,6 +13,7 @@
"""Provide support for linking an external transaction manager with Zope's
"""
+import transaction
class TM:
"""Mix-in class that provides transaction management support
@@ -35,7 +36,7 @@
def _register(self):
if not self._registered:
try:
- get_transaction().register(Surrogate(self))
+ transaction.get().register(Surrogate(self))
self._begin()
self._registered = 1
self._finalize = 0
Modified: Zope/trunk/lib/python/Shared/DC/ZRDB/dbi_db.py
===================================================================
--- Zope/trunk/lib/python/Shared/DC/ZRDB/dbi_db.py 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/Shared/DC/ZRDB/dbi_db.py 2005-03-28 16:34:11 UTC (rev 29694)
@@ -25,6 +25,8 @@
import string, sys
from string import strip, split, find, join
+import transaction
+
failures=0
calls=0
@@ -71,7 +73,7 @@
def register(self):
if self._registered: return
- get_transaction().register(self)
+ transaction.get().register(self)
self._registered=1
Modified: Zope/trunk/lib/python/Testing/ZopeTestCase/testBaseTestCase.py
===================================================================
--- Zope/trunk/lib/python/Testing/ZopeTestCase/testBaseTestCase.py 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/Testing/ZopeTestCase/testBaseTestCase.py 2005-03-28 16:34:11 UTC (rev 29694)
@@ -15,6 +15,8 @@
if __name__ == '__main__':
execfile(os.path.join(sys.path[0], 'framework.py'))
+import transaction
+
from Testing.ZopeTestCase import base
from Testing.ZopeTestCase import utils
@@ -135,7 +137,7 @@
def getObjectsInTransaction(self):
# Lets us spy into the transaction
- t = get_transaction()
+ t = transaction.get()
if hasattr(t, '_objects'): # Zope < 2.8
return t._objects
elif hasattr(t, '_resources'): # Zope >= 2.8
Modified: Zope/trunk/lib/python/Testing/ZopeTestCase/testWebserver.py
===================================================================
--- Zope/trunk/lib/python/Testing/ZopeTestCase/testWebserver.py 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/Testing/ZopeTestCase/testWebserver.py 2005-03-28 16:34:11 UTC (rev 29694)
@@ -30,6 +30,8 @@
from AccessControl import Unauthorized
import urllib
+import transaction
+
# Create the error_log object
ZopeTestCase.utils.setupSiteErrorLog()
@@ -73,11 +75,11 @@
self.folder.change_title.changeOwnership(manager)
# Commit so the ZServer threads can see the changes
- get_transaction().commit()
+ transaction.commit()
def beforeClose(self):
# Commit after cleanup
- get_transaction().commit()
+ transaction.commit()
def testAccessPublicObject(self):
# Test access to a public resource
@@ -177,9 +179,9 @@
# Additionally, it allows us to commit transactions without
# harming the test ZODB.
self.folder.foo = 1
- get_transaction().commit()
+ transaction.commit()
self.folder.foo = 2
- get_transaction().commit()
+ transaction.commit()
def test_suite():
Modified: Zope/trunk/lib/python/Testing/ZopeTestCase/testZODBCompat.py
===================================================================
--- Zope/trunk/lib/python/Testing/ZopeTestCase/testZODBCompat.py 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/Testing/ZopeTestCase/testZODBCompat.py 2005-03-28 16:34:11 UTC (rev 29694)
@@ -14,6 +14,8 @@
from Testing import ZopeTestCase
+import transaction
+
from AccessControl.Permissions import add_documents_images_and_files
from AccessControl.Permissions import delete_objects
import tempfile
@@ -29,7 +31,7 @@
self.folder.addDTMLMethod('doc', file='foo')
# _p_oids are None until we commit a subtransaction
self.assertEqual(self.folder._p_oid, None)
- get_transaction().commit(1)
+ transaction.commit(1)
self.failIfEqual(self.folder._p_oid, None)
def testCutPaste(self):
@@ -80,7 +82,7 @@
self.folder.addDTMLMethod('doc', file='foo')
# _p_oids are None until we commit a subtransaction
self.assertEqual(self.folder._p_oid, None)
- get_transaction().commit(1)
+ transaction.commit(1)
self.failIfEqual(self.folder._p_oid, None)
def testExport(self):
@@ -158,7 +160,7 @@
app = ZopeTestCase.app()
app._setObject('dummy1', DummyObject())
app._setObject('dummy2', DummyObject())
-get_transaction().commit()
+transaction.commit()
ZopeTestCase.close(app)
@@ -295,45 +297,45 @@
def testTransactionAbort(self):
self.folder.foo = 1
self.failUnless(hasattr(self.folder, 'foo'))
- get_transaction().abort()
+ transaction.abort()
# The foo attribute is still present
self.failUnless(hasattr(self.folder, 'foo'))
def testSubTransactionAbort(self):
self.folder.foo = 1
self.failUnless(hasattr(self.folder, 'foo'))
- get_transaction().commit(1)
- get_transaction().abort()
+ transaction.commit(1)
+ transaction.abort()
# This time the abort nukes the foo attribute...
self.failIf(hasattr(self.folder, 'foo'))
def testTransactionAbortPersistent(self):
self.folder._p_foo = 1
self.failUnless(hasattr(self.folder, '_p_foo'))
- get_transaction().abort()
+ transaction.abort()
# The _p_foo attribute is still present
self.failUnless(hasattr(self.folder, '_p_foo'))
def testSubTransactionAbortPersistent(self):
self.folder._p_foo = 1
self.failUnless(hasattr(self.folder, '_p_foo'))
- get_transaction().commit(1)
- get_transaction().abort()
+ transaction.commit(1)
+ transaction.abort()
# This time the abort nukes the _p_foo attribute...
self.failIf(hasattr(self.folder, '_p_foo'))
def testTransactionAbortVolatile(self):
self.folder._v_foo = 1
self.failUnless(hasattr(self.folder, '_v_foo'))
- get_transaction().abort()
+ transaction.abort()
# The _v_foo attribute is still present
self.failUnless(hasattr(self.folder, '_v_foo'))
def testSubTransactionAbortVolatile(self):
self.folder._v_foo = 1
self.failUnless(hasattr(self.folder, '_v_foo'))
- get_transaction().commit(1)
- get_transaction().abort()
+ transaction.commit(1)
+ transaction.abort()
# This time the abort nukes the _v_foo attribute...
self.failIf(hasattr(self.folder, '_v_foo'))
Modified: Zope/trunk/lib/python/Testing/ZopeTestCase/utils.py
===================================================================
--- Zope/trunk/lib/python/Testing/ZopeTestCase/utils.py 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/Testing/ZopeTestCase/utils.py 2005-03-28 16:34:11 UTC (rev 29694)
@@ -7,6 +7,7 @@
# $Id: utils.py,v 1.21 2005/02/11 09:00:21 shh42 Exp $
+import transaction
def setupCoreSessions(app=None):
'''Sets up the session_data_manager e.a.'''
@@ -47,7 +48,8 @@
app._setObject('session_data_manager', sdm)
commit = 1
- if commit: get_transaction().commit()
+ if commit:
+ transaction.commit()
def setupZGlobals(app=None):
@@ -59,7 +61,7 @@
if not root.has_key('ZGlobals'):
from BTrees.OOBTree import OOBTree
root['ZGlobals'] = OOBTree()
- get_transaction().commit()
+ transaction.commit()
def setupSiteErrorLog(app=None):
@@ -74,7 +76,7 @@
pass
else:
app._setObject('error_log', SiteErrorLog())
- get_transaction().commit()
+ transaction.commit()
import os, time
@@ -85,7 +87,7 @@
start = time.time()
if not quiet: _print("Importing %s ... " % os.path.basename(filename))
container._importObjectFromFile(filename, verify=0)
- get_transaction().commit()
+ transaction.commit()
if not quiet: _print('done (%.3fs)\n' % (time.time() - start))
Modified: Zope/trunk/lib/python/ZClasses/Property.py
===================================================================
--- Zope/trunk/lib/python/ZClasses/Property.py 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/ZClasses/Property.py 2005-03-28 16:34:11 UTC (rev 29694)
@@ -13,6 +13,8 @@
"""Provide management of common instance property sheets
"""
+import transaction
+
import OFS.PropertySheets, Globals, OFS.SimpleItem, OFS.PropertyManager
import Acquisition
from AccessControl.Permission import pname
@@ -24,13 +26,13 @@
klass=self._k
setattr(klass, name, v)
if not getattr(klass,'_p_changed',None):
- get_transaction().register(klass)
+ transaction.get().register(klass)
klass._p_changed=1
def __delattr__(self, name):
klass=self._k
delattr(klass, name)
if not getattr(klass,'_p_changed',None):
- get_transaction().register(klass)
+ transaction.get().register(klass)
klass._p_changed=1
@@ -271,7 +273,7 @@
def rclass(klass):
if not getattr(klass, '_p_changed', 0):
- get_transaction().register(klass)
+ transaction.get().register(klass)
klass._p_changed=1
class ZInstanceSheetsSheet(OFS.Traversable.Traversable,
Modified: Zope/trunk/lib/python/ZClasses/ZClass.py
===================================================================
--- Zope/trunk/lib/python/ZClasses/ZClass.py 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/ZClasses/ZClass.py 2005-03-28 16:34:11 UTC (rev 29694)
@@ -23,6 +23,8 @@
from zExceptions import BadRequest, Redirect
import webdav.Collection
+import transaction
+
import marshal
if not hasattr(Products, 'meta_types'):
@@ -301,17 +303,14 @@
hasattr(self._zclass_, '_p_deactivate')
)
- copy._zclass_.__dict__.update(
- self._zclass_.__dict__)
- get_transaction().register(
- copy._zclass_)
+ copy._zclass_.__dict__.update(self._zclass_.__dict__)
+ transaction.get().register(copy._zclass_)
self._p_jar.exchange(self._zclass_, copy._zclass_)
self._zclass_=copy._zclass_
copy._zclass_propertysheets_class.__dict__.update(
self._zclass_propertysheets_class.__dict__)
- get_transaction().register(
- copy._zclass_propertysheets_class)
+ transaction.get().register(copy._zclass_propertysheets_class)
self._p_jar.exchange(self._zclass_propertysheets_class,
copy._zclass_propertysheets_class)
self._zclass_propertysheets_class=copy._zclass_propertysheets_class
@@ -319,8 +318,7 @@
if hasattr(self.propertysheets.__class__, '_p_oid'):
copy.propertysheets.__class__.__dict__.update(
self.propertysheets.__class__.__dict__)
- get_transaction().register(
- copy.propertysheets.__class__)
+ transaction.get().register(copy.propertysheets.__class__)
self._p_jar.exchange(self.propertysheets.__class__,
copy.propertysheets.__class__)
@@ -520,7 +518,7 @@
c=self._zclass_
setattr(c, name, value)
if not c._p_changed:
- get_transaction().register(c)
+ transaction.get().register(c)
c._p_changed=1
delClassAttr__roles__ = () # Private
@@ -528,7 +526,7 @@
c=self._zclass_
delattr(c, name)
if not c._p_changed:
- get_transaction().register(c)
+ transaction.get().register(c)
c._p_changed=1
def classDefinedPermissions(self):
Modified: Zope/trunk/lib/python/ZPublisher/Publish.py
===================================================================
--- Zope/trunk/lib/python/ZPublisher/Publish.py 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/ZPublisher/Publish.py 2005-03-28 16:34:11 UTC (rev 29694)
@@ -275,13 +275,10 @@
transactions_manager=getattr(
module,'zpublisher_transactions_manager', None)
if not transactions_manager:
- try: get_transaction()
- except: pass
- else:
- # Create a default transactions manager for use
- # by software that uses ZPublisher and ZODB but
- # not the rest of Zope.
- transactions_manager = DefaultTransactionsManager()
+ # Create a default transactions manager for use
+ # by software that uses ZPublisher and ZODB but
+ # not the rest of Zope.
+ transactions_manager = DefaultTransactionsManager()
info= (bobo_before, bobo_after, object, realm, debug_mode,
error_hook, validated_hook, transactions_manager)
@@ -302,13 +299,13 @@
def begin(self):
transaction.begin()
def commit(self):
- get_transaction().commit()
+ transaction.commit()
def abort(self):
- get_transaction().abort()
+ transaction.abort()
def recordMetaData(self, object, request):
# Is this code needed?
request_get = request.get
- T=get_transaction()
+ T= transaction.get()
T.note(request_get('PATH_INFO'))
auth_user=request_get('AUTHENTICATED_USER',None)
if auth_user is not None:
Modified: Zope/trunk/lib/python/ZServer/README.txt
===================================================================
--- Zope/trunk/lib/python/ZServer/README.txt 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/ZServer/README.txt 2005-03-28 16:34:11 UTC (rev 29694)
@@ -167,8 +167,9 @@
Remember if you make changes to Zope objects and want those changes to be
saved you need to commmit the transaction::
-
- >>> get_transaction().commit()
+
+ >>> import transaction
+ >>> transaction.commit()
ZServer WebDAV support
Modified: Zope/trunk/lib/python/Zope2/App/startup.py
===================================================================
--- Zope/trunk/lib/python/Zope2/App/startup.py 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/Zope2/App/startup.py 2005-03-28 16:34:11 UTC (rev 29694)
@@ -213,20 +213,15 @@
transaction=transaction):
transaction.begin()
- def commit(self,
- # Optimize global var lookups:
- get_transaction=get_transaction):
- get_transaction().commit()
+ def commit(self):
+ transaction.commit()
- def abort(self,
- # Optimize global var lookups:
- get_transaction=get_transaction):
- get_transaction().abort()
+ def abort(self):
+ transaction.abort()
def recordMetaData(self, object, request,
# Optimize global var lookups:
hasattr=hasattr, getattr=getattr,
- get_transaction=get_transaction,
LOG=LOG, WARNING=WARNING,
):
request_get = request.get
@@ -260,7 +255,7 @@
# used to retrieve the object.
path = request_get('PATH_INFO')
- T=get_transaction()
+ T = transaction.get()
T.note(path)
auth_user=request_get('AUTHENTICATED_USER',None)
if auth_user is not None:
Modified: Zope/trunk/lib/python/Zope2/Startup/zopectl.py
===================================================================
--- Zope/trunk/lib/python/Zope2/Startup/zopectl.py 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/Zope2/Startup/zopectl.py 2005-03-28 16:34:11 UTC (rev 29694)
@@ -39,6 +39,8 @@
import sys
import signal
+import transaction
+
import zdaemon
import Zope2.Startup
@@ -214,7 +216,7 @@
self.options.python ,
'import Zope2; app=Zope2.app();'
'app.acl_users._doAddUser(\'%s\', \'%s\', [\'Manager\'], []);'
- 'get_transaction().commit()'
+ 'transaction.commit()'
) % (name, password)
os.system(cmdline)
Modified: Zope/trunk/lib/python/webdav/davcmds.py
===================================================================
--- Zope/trunk/lib/python/webdav/davcmds.py 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/lib/python/webdav/davcmds.py 2005-03-28 16:34:11 UTC (rev 29694)
@@ -29,6 +29,7 @@
from zExceptions import BadRequest, Forbidden
from common import isDavCollection
from common import PreconditionFailed
+import transaction
def safe_quote(url, mark=r'%'):
if url.find(mark) > -1:
@@ -288,7 +289,7 @@
return result
# This is lame, but I cant find a way to keep ZPublisher
# from sticking a traceback into my xml response :(
- get_transaction().abort()
+ transaction.abort()
result=result.replace( '200 OK', '424 Failed Dependency')
return result
@@ -410,7 +411,7 @@
# One or more subitems probably failed, so close the multistatus
# element and clear out all succesful locks
result.write('</d:multistatus>')
- get_transaction().abort() # This *SHOULD* clear all succesful locks
+ transaction.abort() # This *SHOULD* clear all succesful locks
return token, result.getvalue()
@@ -472,7 +473,7 @@
# One or more subitems probably failed, so close the multistatus
# element and clear out all succesful unlocks
result.write('</d:multistatus>')
- get_transaction().abort()
+ transaction.abort()
return result.getvalue()
Modified: Zope/trunk/utilities/reindex_catalog.py
===================================================================
--- Zope/trunk/utilities/reindex_catalog.py 2005-03-28 15:50:25 UTC (rev 29693)
+++ Zope/trunk/utilities/reindex_catalog.py 2005-03-28 16:34:11 UTC (rev 29694)
@@ -28,6 +28,7 @@
import sys
from optparse import OptionParser
+import transaction
from Products.ZCatalog.ProgressHandler import StdoutHandler
@@ -71,7 +72,7 @@
for id in args:
print 'Reindexing index %s at %s' % (id, options.catalog)
catalog.reindexIndex(id, None, handler)
- get_transaction().commit()
+ transaction.commit()
def refreshMetadata(options, args):
@@ -82,7 +83,7 @@
print 'Refresh metadata at %s' % options.catalog
catalog.refreshMetadata(handler)
- get_transaction().commit()
+ transaction.commit()
def reindexAll(options, args):
@@ -93,7 +94,7 @@
print 'Reindexing complete ZCatalog at %s' % options.catalog
catalog.refreshCatalog(options.clearCatalog, handler)
- get_transaction().commit()
+ transaction.commit()
if __name__ == '__main__':
More information about the Zope-Checkins
mailing list