[Zope-CVS] CVS: Products/Ape/lib/apelib/fs - classification.py:1.3.2.3

[Shane Hathaway]

Update of /cvs-repository/Products/Ape/lib/apelib/fs
In directory cvs.zope.org:/tmp/cvs-serv7640/lib/apelib/fs

Modified Files:
      Tag: ape-0_8-branch
	classification.py 
Log Message:
Renamed ConflictError to OIDConflictError.

ZODB conflict errors are related to high load and can be solved by
improving capacity.  OID conflicts, OTOH, are really programming errors.
They indicate that someone is trying to write different objects for 
a single OID.


=== Products/Ape/lib/apelib/fs/classification.py 1.3.2.2 => 1.3.2.3 ===
--- Products/Ape/lib/apelib/fs/classification.py:1.3.2.2	Sat Dec 20 23:24:04 2003
+++ Products/Ape/lib/apelib/fs/classification.py	Thu Dec 25 23:22:33 2003
@@ -16,7 +16,7 @@
 $Id$
 """
 
-from apelib.core.interfaces import IGateway, LoadError, ConflictError
+from apelib.core.interfaces import IGateway, LoadError, OIDConflictError
 from apelib.core.schemas import FieldSchema
 
 from base import FSGatewayBase
@@ -56,7 +56,7 @@
                 pass
             else:
                 # Something exists.  Don't overwrite it.
-                raise ConflictError(p)
+                raise OIDConflictError(p)
         items = state.items()
         items.sort()
         text = []