Commit 1616e14c authored by Jeremy Hylton's avatar Jeremy Hylton

Use oid_repr().

parent d7a5258f
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
############################################################################## ##############################################################################
"""Database connection support """Database connection support
$Id: Connection.py,v 1.97 2003/06/13 17:03:39 jeremy Exp $""" $Id: Connection.py,v 1.98 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
......
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