death to zLOG

Catalog.py

@@ -17,7 +17,7 @@
 from MultiMapping import MultiMapping
 import Record
 from Missing import MV
-from zLOG import LOG, ERROR
+import logging
 
 from Lazy import LazyMap, LazyFilter, LazyCat, LazyValues
 from CatalogBrains import AbstractCatalogBrain, NoBrainer
@@ -30,6 +30,8 @@
 from bisect import bisect
 from random import randint
 
+LOG = logging.getLogger('ZCatalog')
+
 try:
     from DocumentTemplate.cDocumentTemplate import safe_callable
 except ImportError:
@@ -231,8 +233,7 @@ def delColumn(self, name):
         _index = names.index(name)
 
         if not self.schema.has_key(name):
-            LOG('Catalog', ERROR, ('delColumn attempted to delete '
-                                   'nonexistent column %s.' % str(name)))
+            LOG.error('delColumn attempted to delete nonexistent column %s.' % str(name))
             return
 
         names.remove(name)
@@ -390,8 +391,7 @@ def catalogObject(self, object, uid, threshold=None, idxs=None,
                 blah = x.index_object(index, object, threshold)
                 total = total + blah
             else:
-                LOG('Catalog', ERROR, ('catalogObject was passed '
-                                       'bad index object %s.' % str(x)))
+                LOG.error('catalogObject was passed bad index object %s.' % str(x))
 
         return total
 
@@ -424,9 +424,9 @@ def uncatalogObject(self, uid):
             try: self.__len__.change(-1)
             except AttributeError: pass # No managed length
         else:
-            LOG('Catalog', ERROR, ('uncatalogObject unsuccessfully '
-                                   'attempted to uncatalog an object '
-                                   'with a uid of %s. ' % str(uid)))
+            LOG.error('uncatalogObject unsuccessfully '
+                      'attempted to uncatalog an object '
+                      'with a uid of %s. ' % str(uid))
 
 
     def uniqueValuesFor(self, name):

CatalogBrains.py

@@ -14,8 +14,6 @@
 __version__ = "$Revision$"[11:-2]
 
 import Acquisition, Record
-import zLOG
-import sys
 
 class AbstractCatalogBrain(Record.Record, Acquisition.Implicit):
     """Abstract base brain that handles looking up attributes as

ZCatalogIndexes.py

@@ -11,7 +11,7 @@
 #
 ##############################################################################
 
-"""$Id: ZCatalogIndexes.py,v 1.8 2002/08/14 22:25:15 mj Exp $
+"""$Id: ZCatalogIndexes.py,v 1.9 2004/04/14 08:20:23 andreasjung Exp $
 """
 
 from  Globals import DTMLFile, InitializeClass
@@ -24,11 +24,11 @@
 from OFS.SimpleItem import SimpleItem
 from OFS.ObjectManager import ObjectManager, IFAwareObjectManager
 
-import os, sys, time
+import os, sys, time 
 
 from Acquisition import Implicit
 from Persistence import Persistent
-from zLOG import LOG, ERROR
+
 from Products.PluginIndexes.common.PluggableIndex import PluggableIndexInterface
 
 _marker = []

regressiontests/regressionCatalog.py

@@ -24,7 +24,6 @@
 import ExtensionClass
 from Testing import dispatcher
 import keywords
-from zLOG import LOG
 
 
 import getopt,whrandom,time,string,mailbox,rfc822