zLOG -> logging

lib/python/OFS/ObjectManager.py

@@ -43,7 +43,7 @@ from webdav.Collection import Collection
 from webdav.Lockable import ResourceLockedError
 from webdav.NullResource import NullResource
 from zExceptions import BadRequest
-from zLOG import LOG, ERROR
+
 from ZODB.POSException import ConflictError
 from zope.interface import implements
 
@@ -67,6 +67,7 @@ customImporters={
     }
 
 bad_id=re.compile(r'[^a-zA-Z0-9-_~,.$\(\)# @]').search
+LOG = getLogger('OFS.ObjectManager')
 
 def checkValidId(self, id, allow_dup=0):
     # If allow_dup is false, an error will be raised if an object

lib/python/OFS/Uninstalled.py

@@ -17,11 +17,13 @@ import  SimpleItem, Globals, Acquisition
 from Acquisition import Acquired
 import Persistence
 from thread import allocate_lock
-from zLOG import LOG, WARNING
+
 from cgi import escape
+from logging import getLogger
 
 broken_klasses={}
 broken_klasses_lock = allocate_lock()
+LOG = getLogger('OFS.Uninstalled')
 
 class BrokenClass(Acquisition.Explicit, SimpleItem.Item,
                   Persistence.Overridable):
@@ -71,8 +73,8 @@ def Broken(self, oid, pair):
             klass.info=(
                 'This object\'s class was %s in module %s.' %
                 (klass.__name__, klass.__module__))
-            LOG('ZODB', WARNING, 'Could not import class %s '
-                'from module %s' % (`klass.__name__`, `klass.__module__`))
+            LOG.warning('Could not import class %s '
+                    'from module %s' % (`klass.__name__`, `klass.__module__`))
     finally:
         broken_klasses_lock.release()
     if oid is None: return klass