[Zope3-checkins] CVS: Zope3/src/ZEO - StorageServer.py:1.109

[Jeremy Hylton]

Update of /cvs-repository/Zope3/src/ZEO
In directory cvs.zope.org:/tmp/cvs-serv23866/src/ZEO

Modified Files:
	StorageServer.py 
Log Message:
Merge the jeremy-txn-branch to the head.

This branch introduces a new transaction API.  The key features are:
  - top-level functions in transaction -- get(), commit(), abort() 
  - explicit transaction manager objects
  - Transaction objects are used for exactly one transaction
  - support for transaction synchronizers

The changes here are still provisional, but we want to get them off an
obscure branch and onto the head for further development.


=== Zope3/src/ZEO/StorageServer.py 1.108 => 1.109 ===
--- Zope3/src/ZEO/StorageServer.py:1.108	Thu Feb 19 13:35:25 2004
+++ Zope3/src/ZEO/StorageServer.py	Wed Mar 31 22:56:59 2004
@@ -27,6 +27,8 @@
 import threading
 import time
 
+import transaction
+
 from ZEO import ClientStub
 from ZEO.CommitLog import CommitLog
 from ZEO.monitor import StorageStats, StatsServer
@@ -40,7 +42,6 @@
 from ZODB.POSException import StorageError, StorageTransactionError
 from ZODB.POSException import TransactionError, ReadOnlyError, ConflictError
 from ZODB.serialize import referencesf
-from ZODB.Transaction import Transaction
 from ZODB.utils import u64, oid_repr
 
 _label = "ZSS" # Default label used for logging.
@@ -365,7 +366,7 @@
                 raise StorageTransactionError("Multiple simultaneous tpc_begin"
                                               " requests from one client.")
 
-        self.transaction = t = Transaction()
+        self.transaction = t = transaction.Transaction()
         t.id = id
         t.user = user
         t.description = description