[Zodb-checkins] CVS: StandaloneZODB/bsddb3Storage/bsddb3Storage - Full.py:1.37

[Barry Warsaw]

Update of /cvs-repository/StandaloneZODB/bsddb3Storage/bsddb3Storage
In directory cvs.zope.org:/tmp/cvs-serv15182

Modified Files:
	Full.py 
Log Message:
store(): It is possible that the `serial' argument got passed to us as
None.  If a non-resolvable conflict error occurs, we try to coerce
serial to something more humanly readable, but U64() can't be passed a
None, so let's be a bit more robust.


=== StandaloneZODB/bsddb3Storage/bsddb3Storage/Full.py 1.36 => 1.37 ===
                     raise POSException.ConflictError(
                         'serial number mismatch (was: %s, has: %s)' %
-                        (U64(oserial), U64(serial)))
+                        (U64(oserial), serial and U64(serial)))
             # Do we already know about this version?  If not, we need to
             # record the fact that a new version is being created.  `version'
             # will be the empty string when the transaction is storing on the