Apply comments from review for #43

plone/formwidget/namedfile/datamanager.py

@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 from plone.formwidget.namedfile.interfaces import IScaleGenerateOnSave
+from plone.formwidget.namedfile.utils import get_scale_infos
 from plone.namedfile.field import INamedImageField
 from z3c.form.datamanager import AttributeField
 from ZODB.POSException import ConflictError
 from zope.annotation.interfaces import IAnnotations
 from zope.component import adapter
 from zope.component import getMultiAdapter
-from zope.component import getUtility
 from zope.globalrequest import getRequest
 from zope.interface import Interface
 from zope.interface import alsoProvides
@@ -15,13 +15,6 @@
 import os
 import transaction
 
-try:
-    from Products.CMFPlone.factory import _IMREALLYPLONE5  # noqa
-except ImportError:
-    PLONE_5 = False  # pragma: no cover
-else:
-    PLONE_5 = True  # pragma: no cover
-
 
 ANNOTATION_KEY = "plone.formwidget.namedfile.scale"
 ENVIRONMENT_KEY = "PLONE_SCALE_GENERATE_ON_SAVE"
@@ -32,10 +25,7 @@
 @adapter(Interface, INamedImageField)
 class NamedImageAttributeField(AttributeField):
 
-    def __init__(self, *args, **kwargs):
-        super(NamedImageAttributeField, self).__init__(*args, **kwargs)
-        flag = (os.environ.get(ENVIRONMENT_KEY) or "").lower()
-        self.scale_generate_on_save = flag in ["1", "true", "yes", "on"]
+    scale_generate_on_save = False
 
     def set(self, value):
         """See z3c.form.interfaces.IDataManager"""
@@ -45,20 +35,22 @@ def set(self, value):
                 self.context, getRequest(), self.field.__name__)
 
 
+NamedImageAttributeField.scale_generate_on_save = (
+    os.environ.get(ENVIRONMENT_KEY) or ""
+).lower() in ["1", "true", "yes", "on"]
+
+
 def schedule_plone_scale_generate_on_save(context, request, fieldname):
-    annotations = IAnnotations(request, None)
-    if annotations is not None:
-        annotations.setdefault(ANNOTATION_KEY, [])
-        annotations[ANNOTATION_KEY].append((context, fieldname))
-        alsoProvides(request, IScaleGenerateOnSave)
+    annotations = IAnnotations(request, {})
+    annotations.setdefault(ANNOTATION_KEY, [])
+    annotations[ANNOTATION_KEY].append((context, fieldname))
+    alsoProvides(request, IScaleGenerateOnSave)
 
 
 def plone_scale_generate_on_save(event):
     if not IScaleGenerateOnSave.providedBy(event.request):
         return
-    annotations = IAnnotations(event.request, None)
-    if annotations is None:
-        return
+    annotations = IAnnotations(event.request, {})
     for context, fieldname in annotations.get(ANNOTATION_KEY) or []:
         try:
             images = getMultiAdapter((context, event.request), name="images")
@@ -82,30 +74,3 @@ def plone_scale_generate_on_save(event):
             msg = "/".join(filter(bool, ["/".join(context.getPhysicalPath()),
                                          "@@images", fieldname]))
             logger.warning("ConflictError. Scale not generated on save: " + msg)
-
-
-def get_scale_infos():
-    """Returns a list of (name, width, height) 3-tuples of the
-    available image scales.
-    """
-    from Products.CMFCore.interfaces import IPropertiesTool
-    if PLONE_5:
-        from plone.registry.interfaces import IRegistry
-
-        registry = getUtility(IRegistry)
-        from Products.CMFPlone.interfaces import IImagingSchema
-
-        imaging_settings = registry.forInterface(IImagingSchema, prefix="plone")
-        allowed_sizes = imaging_settings.allowed_sizes
-
-    else:
-        ptool = getUtility(IPropertiesTool)
-        image_properties = ptool.imaging_properties
-        allowed_sizes = image_properties.getProperty("allowed_sizes")
-
-    def split_scale_info(allowed_size):
-        name, dims = allowed_size.split(" ")
-        width, height = list(map(int, dims.split(":")))
-        return name, width, height
-
-    return [split_scale_info(size) for size in allowed_sizes]

plone/formwidget/namedfile/utils.py

@@ -6,10 +6,18 @@
 from random import randint
 from zope.annotation.interfaces import IAnnotations
 from zope.component import adapter
+from zope.component import getUtility
 from zope.interface import implementer
 from zope.interface import Interface
 from ZPublisher.HTTPRequest import FileUpload
 
+try:
+    from Products.CMFPlone.factory import _IMREALLYPLONE5  # noqa
+except ImportError:
+    PLONE_5 = False  # pragma: no cover
+else:
+    PLONE_5 = True  # pragma: no cover
+
 
 FILE_UPLOAD_MAP_KEY = "file_upload_map"
 FILE_UPLOAD_EXPIRATION_TIME = 30 * 60  # seconds
@@ -48,3 +56,30 @@ def cleanup(self):
             ):  # Avoid conflict errors by deleting only every fifth time  # noqa
                 # Delete expired files or files without timestamp
                 del upload_map[key]
+
+
+def get_scale_infos():
+    """Returns a list of (name, width, height) 3-tuples of the
+    available image scales.
+    """
+    from Products.CMFCore.interfaces import IPropertiesTool
+    if PLONE_5:
+        from plone.registry.interfaces import IRegistry
+
+        registry = getUtility(IRegistry)
+        from Products.CMFPlone.interfaces import IImagingSchema
+
+        imaging_settings = registry.forInterface(IImagingSchema, prefix="plone")
+        allowed_sizes = imaging_settings.allowed_sizes
+
+    else:
+        ptool = getUtility(IPropertiesTool)
+        image_properties = ptool.imaging_properties
+        allowed_sizes = image_properties.getProperty("allowed_sizes")
+
+    def split_scale_info(allowed_size):
+        name, dims = allowed_size.split(" ")
+        width, height = list(map(int, dims.split(":")))
+        return name, width, height
+
+    return [split_scale_info(size) for size in allowed_sizes]