[Zope3-checkins] CVS: Zope3/src/ZEO - StorageServer.py:1.108.10.1
Jeremy Hylton
jeremy at zope.com
Wed Mar 31 17:05:31 EST 2004
Update of /cvs-repository/Zope3/src/ZEO
In directory cvs.zope.org:/tmp/cvs-serv16195/src/ZEO
Modified Files:
Tag: jeremy-txn-branch
StorageServer.py
Log Message:
ZODB.Transaction -> transaction.
=== Zope3/src/ZEO/StorageServer.py 1.108 => 1.108.10.1 ===
--- Zope3/src/ZEO/StorageServer.py:1.108 Thu Feb 19 13:35:25 2004
+++ Zope3/src/ZEO/StorageServer.py Wed Mar 31 17:05:29 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
More information about the Zope3-Checkins
mailing list