[Zope-Checkins] CVS: Releases/Zope/lib/python/Zope - __init__.py:1.24

[Matthew T. Kromer]

Update of /cvs-repository/Releases/Zope/lib/python/Zope
In directory cvs.zope.org:/tmp/cvs-serv13673/lib/python/Zope

Modified Files:
	__init__.py 
Log Message:
Lower priority of ConflictErrors so they dont cause undue alarm.


=== Releases/Zope/lib/python/Zope/__init__.py 1.23 => 1.24 ===
 import ZODB.POSException, ZPublisher, string, ZPublisher
 import ExtensionClass
-from zLOG import LOG, INFO, WARNING
+from zLOG import LOG, INFO, WARNING, BLATHER
 
 def debug(*args, **kw):
     return apply(ZPublisher.test,('Zope',)+args, kw)
@@ -186,7 +186,7 @@
             # do this by releasing the hold on it. There should be
             # some sane protocol for this, but for now we'll use
             # brute force:
-            LOG('Z2 CONFLICT', INFO,
+            LOG('Z2 CONFLICT', BLATHER,
                 'Competing writes at, %s' % REQUEST.get('PATH_INFO', ''),
                 error=sys.exc_info())
             raise ZPublisher.Retry(t, v, traceback)