Commit 4104808a authored by Hanno Schlichting's avatar Hanno Schlichting

Eeeh, how embarassing, there's no zope gnomes

parent 28cd2838
...@@ -17,13 +17,13 @@ $Id$ ...@@ -17,13 +17,13 @@ $Id$
from cgi import escape from cgi import escape
from cStringIO import StringIO from cStringIO import StringIO
from logging import getLogger
import copy import copy
import fnmatch import fnmatch
import marshal import marshal
import os import os
import re import re
import sys import sys
import warnings
from AccessControl import ClassSecurityInfo from AccessControl import ClassSecurityInfo
from AccessControl.Permissions import view_management_screens from AccessControl.Permissions import view_management_screens
...@@ -48,7 +48,6 @@ from webdav.Collection import Collection ...@@ -48,7 +48,6 @@ from webdav.Collection import Collection
from webdav.Lockable import ResourceLockedError from webdav.Lockable import ResourceLockedError
from webdav.NullResource import NullResource from webdav.NullResource import NullResource
from zExceptions import BadRequest from zExceptions import BadRequest
from ZODB.POSException import ConflictError
from zope.interface import implements from zope.interface import implements
from zope.component.interfaces import ComponentLookupError from zope.component.interfaces import ComponentLookupError
from zope.event import notify from zope.event import notify
...@@ -56,7 +55,6 @@ from zope.container.contained import ObjectAddedEvent ...@@ -56,7 +55,6 @@ from zope.container.contained import ObjectAddedEvent
from zope.container.contained import ObjectRemovedEvent from zope.container.contained import ObjectRemovedEvent
from zope.container.contained import notifyContainerModified from zope.container.contained import notifyContainerModified
from zope.container.interfaces import IContainer from zope.container.interfaces import IContainer
from zope.interface import implements
from OFS.CopySupport import CopyContainer from OFS.CopySupport import CopyContainer
from OFS.interfaces import IObjectManager from OFS.interfaces import IObjectManager
...@@ -73,6 +71,8 @@ NOT_REPLACEABLE = 0 ...@@ -73,6 +71,8 @@ NOT_REPLACEABLE = 0
REPLACEABLE = 1 REPLACEABLE = 1
UNIQUE = 2 UNIQUE = 2
LOG = getLogger('ObjectManager')
# the name BadRequestException is relied upon by 3rd-party code # the name BadRequestException is relied upon by 3rd-party code
BadRequestException = BadRequest BadRequestException = BadRequest
...@@ -662,7 +662,7 @@ class ObjectManager(CopyContainer, ...@@ -662,7 +662,7 @@ class ObjectManager(CopyContainer,
paths = [] paths = []
zopehome = getattr(cfg, 'zopehome', None) zopehome = getattr(cfg, 'zopehome', None)
if zopehome is not None and cfg.zopehome is not None: if zopehome is not None and cfg.zopehome is not None:
paths.append(zopegome) paths.append(zopehome)
if not cfg.instancehome in paths: if not cfg.instancehome in paths:
paths.append(cfg.instancehome) paths.append(cfg.instancehome)
for impath in paths: for impath in paths:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment