[Zope-Checkins] SVN: Zope/trunk/src/OFS/ObjectManager.py Eeeh, how embarassing, there's no zope gnomes
Hanno Schlichting
plone at hannosch.info
Sat Feb 21 07:05:11 EST 2009
Log message for revision 96897:
Eeeh, how embarassing, there's no zope gnomes
Changed:
U Zope/trunk/src/OFS/ObjectManager.py
-=-
Modified: Zope/trunk/src/OFS/ObjectManager.py
===================================================================
--- Zope/trunk/src/OFS/ObjectManager.py 2009-02-21 11:41:26 UTC (rev 96896)
+++ Zope/trunk/src/OFS/ObjectManager.py 2009-02-21 12:05:11 UTC (rev 96897)
@@ -17,13 +17,13 @@
from cgi import escape
from cStringIO import StringIO
+from logging import getLogger
import copy
import fnmatch
import marshal
import os
import re
import sys
-import warnings
from AccessControl import ClassSecurityInfo
from AccessControl.Permissions import view_management_screens
@@ -48,7 +48,6 @@
from webdav.Lockable import ResourceLockedError
from webdav.NullResource import NullResource
from zExceptions import BadRequest
-from ZODB.POSException import ConflictError
from zope.interface import implements
from zope.component.interfaces import ComponentLookupError
from zope.event import notify
@@ -56,7 +55,6 @@
from zope.container.contained import ObjectRemovedEvent
from zope.container.contained import notifyContainerModified
from zope.container.interfaces import IContainer
-from zope.interface import implements
from OFS.CopySupport import CopyContainer
from OFS.interfaces import IObjectManager
@@ -73,6 +71,8 @@
REPLACEABLE = 1
UNIQUE = 2
+LOG = getLogger('ObjectManager')
+
# the name BadRequestException is relied upon by 3rd-party code
BadRequestException = BadRequest
@@ -662,7 +662,7 @@
paths = []
zopehome = getattr(cfg, 'zopehome', None)
if zopehome is not None and cfg.zopehome is not None:
- paths.append(zopegome)
+ paths.append(zopehome)
if not cfg.instancehome in paths:
paths.append(cfg.instancehome)
for impath in paths:
More information about the Zope-Checkins
mailing list