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
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
Nicolas Wavrant
ZODB
Commits
1616e14c
Commit
1616e14c
authored
Jun 13, 2003
by
Jeremy Hylton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use oid_repr().
parent
d7a5258f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
3 deletions
+5
-3
src/ZODB/Connection.py
src/ZODB/Connection.py
+5
-3
No files found.
src/ZODB/Connection.py
View file @
1616e14c
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
##############################################################################
##############################################################################
"""Database connection support
"""Database connection support
$Id: Connection.py,v 1.9
7 2003/06/13 17:03:39
jeremy Exp $"""
$Id: Connection.py,v 1.9
8 2003/06/13 21:53:08
jeremy Exp $"""
from
__future__
import
nested_scopes
from
__future__
import
nested_scopes
...
@@ -25,6 +25,7 @@ from zLOG import LOG, ERROR, BLATHER, WARNING
...
@@ -25,6 +25,7 @@ from zLOG import LOG, ERROR, BLATHER, WARNING
from
coptimizations
import
new_persistent_id
from
coptimizations
import
new_persistent_id
from
ConflictResolution
import
ResolvedSerial
from
ConflictResolution
import
ResolvedSerial
from
Transaction
import
Transaction
,
get_transaction
from
Transaction
import
Transaction
,
get_transaction
from
ZODB.utils
import
oid_repr
from
cPickle
import
Unpickler
,
Pickler
from
cPickle
import
Unpickler
,
Pickler
from
cStringIO
import
StringIO
from
cStringIO
import
StringIO
...
@@ -547,7 +548,7 @@ class Connection(ExportImport.ExportImport):
...
@@ -547,7 +548,7 @@ class Connection(ExportImport.ExportImport):
if
self
.
_storage
is
None
:
if
self
.
_storage
is
None
:
msg
=
(
"Shouldn't load state for %s "
msg
=
(
"Shouldn't load state for %s "
"when the connection is closed"
%
`oid`
)
"when the connection is closed"
%
oid_repr
(
oid
)
)
LOG
(
'ZODB'
,
ERROR
,
msg
)
LOG
(
'ZODB'
,
ERROR
,
msg
)
raise
RuntimeError
(
msg
)
raise
RuntimeError
(
msg
)
...
@@ -569,7 +570,8 @@ class Connection(ExportImport.ExportImport):
...
@@ -569,7 +570,8 @@ class Connection(ExportImport.ExportImport):
except
ConflictError
:
except
ConflictError
:
raise
raise
except
:
except
:
LOG
(
'ZODB'
,
ERROR
,
"Couldn't load state for %s"
%
`oid`
,
LOG
(
'ZODB'
,
ERROR
,
"Couldn't load state for %s"
%
oid_repr
(
oid
),
error
=
sys
.
exc_info
())
error
=
sys
.
exc_info
())
raise
raise
...
...
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