Merge pull request #244 from collective/export-namedimage-blobpaths

Fix `AtributeError: 'NamedImage' object has no attribute '_blob'`

CHANGES.rst

@@ -7,6 +7,8 @@ Changelog
 
 - Add and run a black version, that is compatible with Python 2.
   [pgrunewald]
+- Fix ``AtributeError: 'NamedImage' object has no attribute '_blob'`` similar to #236.
+  [petschki]
 
 - Make zcml conditions more specific so that migration aliases don't trigger them
   [reinhardt]

setup.py

@@ -31,6 +31,8 @@
     install_requires.append("jsonschema < 4")
     install_requires.append("pathlib2")
     install_requires.append("plone.api >= 1.8.4, < 2")
+
+    install_requires.append("ijson < 3.3.0")
     # There is a py2-imcompatibility in plone.rest 3.0.1
     install_requires.append("plone.rest < 3.0.1")
     install_requires.append("plone.restapi < 8")

src/collective/exportimport/serializer.py

@@ -7,7 +7,7 @@
 from hurry.filesize import size
 from plone.app.textfield.interfaces import IRichText
 from plone.dexterity.interfaces import IDexterityContent
-from plone.namedfile.interfaces import INamedFileField, INamedBlobFileField
+from plone.namedfile.interfaces import INamedFileField, INamedBlobFileField, INamedImageField, INamedBlobImageField
 from plone.namedfile.interfaces import INamedImageField
 from plone.restapi.behaviors import IBlocks
 from plone.restapi.interfaces import IFieldSerializer
@@ -619,6 +619,15 @@ def __call__(self):
 
 @adapter(INamedImageField, IDexterityContent, IPathBlobsMarker)
 @implementer(IFieldSerializer)
+class ImageFieldSerializerZODBData(ImageFieldSerializerWithBlobs):
+    """Although the marker is IPathBlobsMarker, this being a plain NamedImage
+    object, its data is in the ZODB, thus this still needs to be
+    base64 encoded into the JSON file
+    So we just subclass from the above ImageFieldSerializerWithBlobs"""
+
+
+@adapter(INamedBlobImageField, IDexterityContent, IPathBlobsMarker)
+@implementer(IFieldSerializer)
 class ImageFieldSerializerWithBlobPaths(DefaultFieldSerializer):
     def __call__(self):
         image = self.field.get(self.context)