[Zope3-checkins] CVS: Zope3/src/transaction -
_transaction.py:1.1.2.6
Tim Peters
tim.one at comcast.net
Fri Mar 19 15:52:59 EST 2004
Update of /cvs-repository/Zope3/src/transaction
In directory cvs.zope.org:/tmp/cvs-serv16859/src/transaction
Modified Files:
Tag: jeremy-txn-branch
_transaction.py
Log Message:
Trimmed trailing whitespace.
=== Zope3/src/transaction/_transaction.py 1.1.2.5 => 1.1.2.6 ===
--- Zope3/src/transaction/_transaction.py:1.1.2.5 Fri Mar 19 15:49:34 2004
+++ Zope3/src/transaction/_transaction.py Fri Mar 19 15:52:58 2004
@@ -100,7 +100,7 @@
self._synchronizers = synchronizers or []
self._manager = manager
self._adapters = {}
-
+
# The user, description, and _extension attributes are accessed
# directory by storages, leading underscore notwithstanding.
self.user = ""
@@ -114,7 +114,7 @@
# subtransactions
self._sub = {}
# _nonsub contains all the resource managers that do not
- # support subtransactions that were involved in
+ # support subtransactions that were involved in
# subtransaction commits.
self._nonsub = {}
@@ -154,7 +154,7 @@
for s in self._synchronizers:
s.afterCompletion()
self._manager.free(self)
-
+
def _commitResources(self, subtransaction):
# Execute the two-phase commit protocol.
@@ -238,10 +238,10 @@
L = d.values()
else:
L = list(self._resources)
-
+
L.sort(rm_cmp)
return L
-
+
def abort(self, subtransaction=False):
if not subtransaction:
for s in self._synchronizers:
@@ -260,7 +260,7 @@
t, v, tb = sys.exc_info()
self.log.error("Failed to abort resource manager: %s",
rm, exc_info=sys.exc_info())
-
+
if not subtransaction:
for rm in self._sub.values():
rm.abort_sub(self)
@@ -344,7 +344,7 @@
object_hint(o), exc_info=sys.exc_info())
if tb is not None:
raise t, v, tb
-
+
class ObjectAdapterSub(ObjectAdapter):
"""Adapt resource managers that participate in subtransactions."""
@@ -362,7 +362,7 @@
This function does not raise an exception.
"""
-
+
from ZODB.utils import oid_repr
# We should always be able to get __class__.
@@ -372,4 +372,4 @@
if oid is not _marker:
oid = oid_repr(oid)
return "%s oid=%s" % (klass, oid)
-
+
More information about the Zope3-Checkins
mailing list