From 522e40f242649b93dad6a7b48b2a0cf418277215 Mon Sep 17 00:00:00 2001 From: Helmut Merz Date: Mon, 4 May 2020 16:30:34 +0200 Subject: [PATCH] fix import: stop deprecation warning --- concept.py | 2 +- interfaces.py | 2 +- security/common.py | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/concept.py b/concept.py index cb7226e..637ca74 100644 --- a/concept.py +++ b/concept.py @@ -27,11 +27,11 @@ from zope.app.container.interfaces import IAdding from zope.app.security.interfaces import IAuthentication, PrincipalLookupError from zope.cachedescriptors.property import Lazy from zope.component import adapts -from zope.component.interfaces import ObjectEvent from zope.dublincore.interfaces import IZopeDublinCore from zope.event import notify from zope.interface import implements from zope.interface import alsoProvides, directlyProvides, directlyProvidedBy +from zope.interface.interfaces import ObjectEvent from zope.publisher.interfaces.browser import IBrowserRequest from zope.security.proxy import removeSecurityProxy, isinstance from zope.traversing.api import getName, getParent diff --git a/interfaces.py b/interfaces.py index ccb4c44..71b1222 100644 --- a/interfaces.py +++ b/interfaces.py @@ -27,7 +27,7 @@ from zope.schema._bootstrapinterfaces import StopValidation from zope.app.container.constraints import contains, containers from zope.app.container.interfaces import IContainer, IOrderedContainer from zope.app.file.interfaces import IImage as IBaseAsset -from zope.component.interfaces import IObjectEvent +from zope.interface.interfaces import IObjectEvent from zope.size.interfaces import ISized from cybertools.composer.schema.interfaces import FieldType diff --git a/security/common.py b/security/common.py index 4f8eef0..4c8cd1c 100644 --- a/security/common.py +++ b/security/common.py @@ -68,6 +68,8 @@ workspaceGroupsFolderName = 'gloops_ws' # checking and querying functions +# TODO: activate canAccessObjectWithOption depending on custom.config + def getOption(obj, option, checkType=True): opts = component.queryAdapter(adapted(obj), IOptions) if opts is not None: @@ -75,6 +77,7 @@ def getOption(obj, option, checkType=True): if opt is True: return opt if opt: + # TODO: log return opt[0] if not checkType: return None @@ -86,6 +89,7 @@ def getOption(obj, option, checkType=True): if opt is True: return opt if opt: + # TODO: log return opt[0] return None