Commit 8e5fa55e authored by Jeremy Hylton's avatar Jeremy Hylton

Add a little whitespace.

parent 7c6cd709
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
############################################################################## ##############################################################################
"""Database connection support """Database connection support
$Id: Connection.py,v 1.72 2002/08/14 22:07:09 mj Exp $""" $Id: Connection.py,v 1.73 2002/09/07 16:22:16 jeremy Exp $"""
from cPickleCache import PickleCache, MUCH_RING_CHECKING from cPickleCache import PickleCache, MUCH_RING_CHECKING
from POSException import ConflictError, ReadConflictError from POSException import ConflictError, ReadConflictError
...@@ -275,21 +275,18 @@ class Connection(ExportImport.ExportImport): ...@@ -275,21 +275,18 @@ class Connection(ExportImport.ExportImport):
method_name, args, kw = self.__onCommitActions.pop(0) method_name, args, kw = self.__onCommitActions.pop(0)
apply(getattr(self, method_name), (transaction,) + args, kw) apply(getattr(self, method_name), (transaction,) + args, kw)
return return
oid=object._p_oid oid = object._p_oid
invalid=self._invalid invalid = self._invalid
if oid is None or object._p_jar is not self: if oid is None or object._p_jar is not self:
# new object # new object
oid = self.new_oid() oid = self.new_oid()
object._p_jar=self object._p_jar = self
object._p_oid=oid object._p_oid = oid
self._creating.append(oid) self._creating.append(oid)
elif object._p_changed: elif object._p_changed:
if ( if ((invalid(oid) and not hasattr(object, '_p_resolveConflict'))
(invalid(oid) and not hasattr(object, '_p_resolveConflict')) or invalid(None)):
or
invalid(None)
):
raise ConflictError(object=object) raise ConflictError(object=object)
self._invalidating.append(oid) self._invalidating.append(oid)
...@@ -297,7 +294,7 @@ class Connection(ExportImport.ExportImport): ...@@ -297,7 +294,7 @@ class Connection(ExportImport.ExportImport):
# Nothing to do # Nothing to do
return return
stack=[object] stack = [object]
# Create a special persistent_id that passes T and the subobject # Create a special persistent_id that passes T and the subobject
# stack along: # stack along:
...@@ -610,8 +607,8 @@ class Connection(ExportImport.ExportImport): ...@@ -610,8 +607,8 @@ class Connection(ExportImport.ExportImport):
def tpc_begin(self, transaction, sub=None): def tpc_begin(self, transaction, sub=None):
if self._invalid(None): # Some nitwit invalidated everything! if self._invalid(None): # Some nitwit invalidated everything!
raise ConflictError("transaction already invalidated") raise ConflictError("transaction already invalidated")
self._invalidating=[] self._invalidating = []
self._creating=[] self._creating = []
if sub: if sub:
# Sub-transaction! # Sub-transaction!
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment