[Zope-Checkins] CVS: ZODB3/ZODB - ConflictResolution.py:1.15 __init__.py:1.19

[Guido van Rossum]

Update of /cvs-repository/ZODB3/ZODB
In directory cvs.zope.org:/tmp/cvs-serv15721

Modified Files:
	ConflictResolution.py __init__.py 
Log Message:
Merge changes from ZODB3 3.1 final release. Bump version to 3.1+.

=== ZODB3/ZODB/ConflictResolution.py 1.14 => 1.15 ===
--- ZODB3/ZODB/ConflictResolution.py:1.14	Fri Sep 27 14:35:09 2002
+++ ZODB3/ZODB/ConflictResolution.py	Wed Oct 30 13:58:29 2002
@@ -116,6 +116,15 @@
         return file.getvalue(1)
     except ConflictError:
         return 0
+    except:
+        # If anything else went wrong, catch it here and avoid passing an
+        # arbitrary exception back to the client.  The error here will mask
+        # the original ConflictError.  A client can recover from a
+        # ConflictError, but not necessarily from other errors.  But log
+        # the error so that any problems can be fixed.
+        zLOG.LOG("Conflict Resolution", zLOG.ERROR,
+                 "Unexpected error", error=sys.exc_info())
+        return 0
 
 class ConflictResolvingStorage:
     "Mix-in class that provides conflict resolution handling for storages"


=== ZODB3/ZODB/__init__.py 1.18 => 1.19 ===
--- ZODB3/ZODB/__init__.py:1.18	Fri Oct  4 20:40:37 2002
+++ ZODB3/ZODB/__init__.py	Wed Oct 30 13:58:29 2002
@@ -12,7 +12,7 @@
 #
 ##############################################################################
 
-__version__ = '3.1b2'
+__version__ = '3.1+'
 
 import sys
 import cPersistence, Persistence