Merge pull request #277 from collective/thet/fix-html-fixes

fix html: Don't fail if a tag does not have some attributes.

Author: pbauer

CHANGES.rst

@@ -7,6 +7,8 @@ Changelog
 
 - Notify the comment creation to have them indexed in the catalog
   [erral]
+- fix html: Don't fail if a tag does not have some attributes.
+  [thet]
 - Skip setting a default page if the default is already set to the same value.
   [mamico]
 - Fixed data extraction of Archetypes ATFilefields to concatenate all `Pdata` chunks, when the FileField data was still stored in Filestorage and not not migrated to use blobstorage (using plone.app.blobs).

src/collective/exportimport/fix_html.py

@@ -518,11 +518,15 @@ def img_variant_fixer(text, obj=None, fallback_variant=None):
         if "data-val" not in tag.attrs:
             # maybe external image
             continue
-        scale = tag["data-scale"]
-        variant = scale_variant_mapping.get(scale, fallback_variant)
+        scale = tag.get("data-scale")
+        variant = (
+            scale_variant_mapping.get(scale, fallback_variant)
+            if scale
+            else fallback_variant
+        )
         tag["data-picturevariant"] = variant
 
-        classes = tag["class"]
+        classes = tag.get("class", [])
         new_class = "picture-variant-{}".format(variant)
         if new_class not in classes:
             classes.append(new_class)