--- a/src/pyams_content/component/illustration/__init__.py Thu Sep 06 17:43:49 2018 +0200
+++ b/src/pyams_content/component/illustration/__init__.py Fri Sep 07 16:40:05 2018 +0200
@@ -15,21 +15,28 @@
# import standard library
+# import packages
+from persistent import Persistent
+from pyramid.events import subscriber
+from pyramid.threadlocal import get_current_registry
+from zope.container.contained import Contained
+from zope.interface import implementer, alsoProvides
+from zope.lifecycleevent import ObjectAddedEvent
+from zope.lifecycleevent.interfaces import IObjectAddedEvent, IObjectModifiedEvent
+from zope.location.interfaces import ISublocations
+from zope.schema.fieldproperty import FieldProperty
+from zope.traversing.interfaces import ITraversable
+
+from pyams_content import _
# import interfaces
from pyams_content.component.illustration.interfaces import IIllustration, IIllustrationTarget, \
ILLUSTRATION_KEY, ILLUSTRATION_RENDERERS, IBasicIllustration, IBasicIllustrationTarget, BASIC_ILLUSTRATION_KEY, \
ILinkIllustrationTarget, LINK_ILLUSTRATION_KEY, ILinkIllustration
+from pyams_content.features.checker import BaseContentChecker
from pyams_content.features.checker.interfaces import IContentChecker, MISSING_VALUE, MISSING_LANG_VALUE
+from pyams_content.features.renderer import RenderedContentMixin, RenderersVocabulary
from pyams_file.interfaces import IFileInfo, IImage, IResponsiveImage
from pyams_i18n.interfaces import INegotiator, II18n, II18nManager
-from zope.lifecycleevent.interfaces import IObjectAddedEvent, IObjectModifiedEvent
-from zope.location.interfaces import ISublocations
-from zope.traversing.interfaces import ITraversable
-
-# import packages
-from persistent import Persistent
-from pyams_content.features.checker import BaseContentChecker
-from pyams_content.features.renderer import RenderedContentMixin, RenderersVocabulary
from pyams_i18n.property import I18nFileProperty
from pyams_utils.adapter import adapter_config, ContextAdapter, get_annotation_adapter
from pyams_utils.factory import factory_config
@@ -37,14 +44,6 @@
from pyams_utils.request import check_request
from pyams_utils.traversing import get_parent
from pyams_utils.vocabulary import vocabulary_config
-from pyramid.events import subscriber
-from pyramid.threadlocal import get_current_registry
-from zope.container.contained import Contained
-from zope.interface import implementer, alsoProvides
-from zope.lifecycleevent import ObjectCreatedEvent, ObjectAddedEvent
-from zope.schema.fieldproperty import FieldProperty
-
-from pyams_content import _
@implementer(IBasicIllustration)
@@ -52,9 +51,10 @@
class BasicIllustration(Persistent, Contained):
"""Illustration persistent class"""
- _data = I18nFileProperty(IIllustration['data'])
- title = FieldProperty(IIllustration['title'])
- alt_title = FieldProperty(IIllustration['alt_title'])
+ _data = I18nFileProperty(IBasicIllustration['data'])
+ title = FieldProperty(IBasicIllustration['title'])
+ alt_title = FieldProperty(IBasicIllustration['alt_title'])
+ author = FieldProperty(IBasicIllustration['author'])
@property
def data(self):
@@ -94,7 +94,6 @@
"""Illustration persistent class"""
description = FieldProperty(IIllustration['description'])
- author = FieldProperty(IIllustration['author'])
renderer = FieldProperty(IIllustration['renderer'])