Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Z
zodb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Joshua
zodb
Commits
8e5fa55e
Commit
8e5fa55e
authored
Sep 07, 2002
by
Jeremy Hylton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add a little whitespace.
parent
7c6cd709
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
13 deletions
+10
-13
src/ZODB/Connection.py
src/ZODB/Connection.py
+10
-13
No files found.
src/ZODB/Connection.py
View file @
8e5fa55e
...
...
@@ -13,7 +13,7 @@
##############################################################################
"""Database connection support
$Id: Connection.py,v 1.7
2 2002/08/14 22:07:09 mj
Exp $"""
$Id: Connection.py,v 1.7
3 2002/09/07 16:22:16 jeremy
Exp $"""
from
cPickleCache
import
PickleCache
,
MUCH_RING_CHECKING
from
POSException
import
ConflictError
,
ReadConflictError
...
...
@@ -275,21 +275,18 @@ class Connection(ExportImport.ExportImport):
method_name
,
args
,
kw
=
self
.
__onCommitActions
.
pop
(
0
)
apply
(
getattr
(
self
,
method_name
),
(
transaction
,)
+
args
,
kw
)
return
oid
=
object
.
_p_oid
invalid
=
self
.
_invalid
oid
=
object
.
_p_oid
invalid
=
self
.
_invalid
if
oid
is
None
or
object
.
_p_jar
is
not
self
:
# new object
oid
=
self
.
new_oid
()
object
.
_p_jar
=
self
object
.
_p_oid
=
oid
object
.
_p_jar
=
self
object
.
_p_oid
=
oid
self
.
_creating
.
append
(
oid
)
elif
object
.
_p_changed
:
if
(
(
invalid
(
oid
)
and
not
hasattr
(
object
,
'_p_resolveConflict'
))
or
invalid
(
None
)
):
if
((
invalid
(
oid
)
and
not
hasattr
(
object
,
'_p_resolveConflict'
))
or
invalid
(
None
)):
raise
ConflictError
(
object
=
object
)
self
.
_invalidating
.
append
(
oid
)
...
...
@@ -297,7 +294,7 @@ class Connection(ExportImport.ExportImport):
# Nothing to do
return
stack
=
[
object
]
stack
=
[
object
]
# Create a special persistent_id that passes T and the subobject
# stack along:
...
...
@@ -610,8 +607,8 @@ class Connection(ExportImport.ExportImport):
def
tpc_begin
(
self
,
transaction
,
sub
=
None
):
if
self
.
_invalid
(
None
):
# Some nitwit invalidated everything!
raise
ConflictError
(
"transaction already invalidated"
)
self
.
_invalidating
=
[]
self
.
_creating
=
[]
self
.
_invalidating
=
[]
self
.
_creating
=
[]
if
sub
:
# Sub-transaction!
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment