Commit 7c24ccab authored by Chris McDonough's avatar Chris McDonough

Made oids in conflict error raises show their __repr__ value.

parent 6de818f4
...@@ -84,8 +84,8 @@ ...@@ -84,8 +84,8 @@
############################################################################## ##############################################################################
"""Database connection support """Database connection support
$Id: Connection.py,v 1.41 2001/01/11 21:57:20 jim Exp $""" $Id: Connection.py,v 1.42 2001/01/15 15:49:29 chrism Exp $"""
__version__='$Revision: 1.41 $'[11:-2] __version__='$Revision: 1.42 $'[11:-2]
from cPickleCache import PickleCache from cPickleCache import PickleCache
from POSException import ConflictError, ExportError from POSException import ConflictError, ExportError
...@@ -265,7 +265,7 @@ class Connection(ExportImport.ExportImport): ...@@ -265,7 +265,7 @@ class Connection(ExportImport.ExportImport):
object._p_oid=oid object._p_oid=oid
elif object._p_changed: 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) self._invalidating.append(oid)
else: else:
...@@ -321,7 +321,7 @@ class Connection(ExportImport.ExportImport): ...@@ -321,7 +321,7 @@ class Connection(ExportImport.ExportImport):
del stack[-1] del stack[-1]
oid=object._p_oid oid=object._p_oid
serial=getattr(object, '_p_serial', '\0\0\0\0\0\0\0\0') 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__ klass = object.__class__
if klass is ExtensionKlass: if klass is ExtensionKlass:
......
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