diff --git a/src/plonemeeting/portal/core/__init__.py b/src/plonemeeting/portal/core/__init__.py index 613a5690..776bf455 100644 --- a/src/plonemeeting/portal/core/__init__.py +++ b/src/plonemeeting/portal/core/__init__.py @@ -4,10 +4,12 @@ import logging + logger = logging.getLogger("plonemeeting.portal.core") from plonemeeting.portal.core import patches # NOQA + assert patches # workaround for pyflakes issue #13, NOQA _ = MessageFactory("plonemeeting.portal.core") diff --git a/src/plonemeeting/portal/core/content/meeting.py b/src/plonemeeting/portal/core/content/meeting.py index 895bfe53..c64e0a56 100644 --- a/src/plonemeeting/portal/core/content/meeting.py +++ b/src/plonemeeting/portal/core/content/meeting.py @@ -1,15 +1,16 @@ # -*- coding: utf-8 -*- from Acquisition import aq_base -from Products.CMFCore.utils import getToolByName from plone.app.textfield import RichText from plone.autoform import directives as form from plone.dexterity.content import Container -from plone.folder.interfaces import IOrdering, IOrderableFolder +from plone.folder.interfaces import IOrderableFolder +from plone.folder.interfaces import IOrdering from plone.folder.unordered import UnorderedOrdering from plone.supermodel import model from plonemeeting.portal.core import _ from plonemeeting.portal.core.content.item import IItem from Products.CMFCore.permissions import ManagePortal +from Products.CMFCore.utils import getToolByName from Products.CMFPlone import PloneMessageFactory as plone_ from zope import schema from zope.component import adapter diff --git a/src/plonemeeting/portal/core/content/publication.py b/src/plonemeeting/portal/core/content/publication.py index c2052a7e..84ebdeeb 100644 --- a/src/plonemeeting/portal/core/content/publication.py +++ b/src/plonemeeting/portal/core/content/publication.py @@ -1,7 +1,7 @@ from AccessControl import ClassSecurityInfo from collective.timestamp.behaviors.timestamp import ITimestampableDocument -from DateTime import DateTime from collective.timestamp.interfaces import ITimeStamper +from DateTime import DateTime from imio.helpers import EMPTY_DATETIME from imio.helpers.content import object_values from plone import api diff --git a/src/plonemeeting/portal/core/patches.py b/src/plonemeeting/portal/core/patches.py index 424f3331..fd618a3f 100644 --- a/src/plonemeeting/portal/core/patches.py +++ b/src/plonemeeting/portal/core/patches.py @@ -1,13 +1,13 @@ # -*- coding: utf-8 -*- -import logging - from plonemeeting.portal.core import logger +from Products.CMFPlone.resources import utils +from Products.CMFPlone.resources.utils import get_resource from Products.PortalTransforms.transforms import safe_html from Products.PortalTransforms.transforms.safe_html import CSS_COMMENT from Products.PortalTransforms.transforms.safe_html import decode_htmlentities -from Products.CMFPlone.resources import utils -from Products.CMFPlone.resources.utils import get_resource +import logging + original_hasScript = safe_html.hasScript diff --git a/src/plonemeeting/portal/core/rest/meeting.py b/src/plonemeeting/portal/core/rest/meeting.py index fe16902a..051d8c8f 100644 --- a/src/plonemeeting/portal/core/rest/meeting.py +++ b/src/plonemeeting/portal/core/rest/meeting.py @@ -1,9 +1,8 @@ from Acquisition import aq_parent -from Products.CMFCore.utils import getToolByName from plone.restapi.interfaces import IJsonCompatible - from plonemeeting.portal.core.rest.base import PublicAPIView from plonemeeting.portal.core.rest.interfaces import IItemSerializeToJson +from Products.CMFCore.utils import getToolByName from zope.component import queryMultiAdapter diff --git a/src/plonemeeting/portal/core/rest/serializers.py b/src/plonemeeting/portal/core/rest/serializers.py index c182747f..45e8634a 100644 --- a/src/plonemeeting/portal/core/rest/serializers.py +++ b/src/plonemeeting/portal/core/rest/serializers.py @@ -3,8 +3,8 @@ from plone.restapi.interfaces import IFieldSerializer from plone.restapi.serializer.converters import json_compatible from plonemeeting.portal.core.rest.interfaces import IInstitutionSerializeToJson -from plonemeeting.portal.core.rest.interfaces import IMeetingSerializeToJson from plonemeeting.portal.core.rest.interfaces import IItemSerializeToJson +from plonemeeting.portal.core.rest.interfaces import IMeetingSerializeToJson from zope.component import adapter from zope.component import queryMultiAdapter from zope.interface import implementer diff --git a/src/plonemeeting/portal/core/rest/site.py b/src/plonemeeting/portal/core/rest/site.py index 3f9bc495..8830a5dd 100644 --- a/src/plonemeeting/portal/core/rest/site.py +++ b/src/plonemeeting/portal/core/rest/site.py @@ -3,14 +3,14 @@ from plone.memoize import ram from plone.protect.interfaces import IDisableCSRFProtection from plone.restapi.interfaces import ISerializeToJson -from plonemeeting.portal.core.cache import published_institutions_modified_cachekey from plonemeeting.portal.core import logger +from plonemeeting.portal.core.cache import published_institutions_modified_cachekey from plonemeeting.portal.core.config import DEMO_INSTITUTION_IDS from plonemeeting.portal.core.config import LOCATIONS_API_URL from plonemeeting.portal.core.config import REGION_INS_CODE +from plonemeeting.portal.core.rest.base import PublicAPIView from plonemeeting.portal.core.rest.interfaces import IInstitutionSerializeToJson from Products.Five.browser import BrowserView -from plonemeeting.portal.core.rest.base import PublicAPIView from zope.component import getUtility from zope.component import queryMultiAdapter from zope.interface import alsoProvides diff --git a/src/plonemeeting/portal/core/widgets/colorselect.py b/src/plonemeeting/portal/core/widgets/colorselect.py index 1da3b970..170e21e0 100644 --- a/src/plonemeeting/portal/core/widgets/colorselect.py +++ b/src/plonemeeting/portal/core/widgets/colorselect.py @@ -1,16 +1,17 @@ # -*- coding: utf-8 -*- +from z3c.form.browser import widget from z3c.form.browser.text import TextWidget from z3c.form.browser.widget import HTMLTextInputWidget from z3c.form.interfaces import IFieldWidget from z3c.form.interfaces import IFormLayer from z3c.form.interfaces import IWidget -from z3c.form.widget import FieldWidget, Widget +from z3c.form.widget import FieldWidget +from z3c.form.widget import Widget from zope.component import adapter from zope.interface import implementer from zope.interface import implementer_only from zope.schema.interfaces import IField -from z3c.form.browser import widget class IColorSelectWidget(IWidget): """Marker interface"""