Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Z
ZEO
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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
ZEO
Commits
7c24ccab
Commit
7c24ccab
authored
Jan 15, 2001
by
Chris McDonough
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Made oids in conflict error raises show their __repr__ value.
parent
6de818f4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
src/ZODB/Connection.py
src/ZODB/Connection.py
+4
-4
No files found.
src/ZODB/Connection.py
View file @
7c24ccab
...
...
@@ -84,8 +84,8 @@
##############################################################################
"""Database connection support
$Id: Connection.py,v 1.4
1 2001/01/11 21:57:20 ji
m Exp $"""
__version__
=
'$Revision: 1.4
1
$'
[
11
:
-
2
]
$Id: Connection.py,v 1.4
2 2001/01/15 15:49:29 chris
m Exp $"""
__version__
=
'$Revision: 1.4
2
$'
[
11
:
-
2
]
from
cPickleCache
import
PickleCache
from
POSException
import
ConflictError
,
ExportError
...
...
@@ -265,7 +265,7 @@ class Connection(ExportImport.ExportImport):
object
.
_p_oid
=
oid
elif
object
.
_p_changed
:
if
invalid
(
oid
)
or
invalid
(
None
):
raise
ConflictError
,
oid
if
invalid
(
oid
)
or
invalid
(
None
):
raise
ConflictError
,
`oid`
self
.
_invalidating
.
append
(
oid
)
else
:
...
...
@@ -321,7 +321,7 @@ class Connection(ExportImport.ExportImport):
del
stack
[
-
1
]
oid
=
object
.
_p_oid
serial
=
getattr
(
object
,
'_p_serial'
,
'
\
0
\
0
\
0
\
0
\
0
\
0
\
0
\
0
'
)
if
invalid
(
oid
):
raise
ConflictError
,
oid
if
invalid
(
oid
):
raise
ConflictError
,
`oid`
klass
=
object
.
__class__
if
klass
is
ExtensionKlass
:
...
...
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