volto formsupport 3.3.0 compat

.github/workflows/pyroma.yml

@@ -28,7 +28,7 @@ jobs:
 
       # install pyroma
       - name: install pyroma
-        run: pip install pyroma==4.3.0
+        run: pip install pyroma==4.2
 
       # run pyroma
       - name: run pyroma

CHANGES.rst

@@ -4,8 +4,8 @@ Changelog
 5.0.17 (unreleased)
 -------------------
 
-- Nothing changed yet.
-
+- formsupport 3.3.0 compatibility.
+  [mamico]
 
 5.0.16 (2025-07-04)
 -------------------

setup.py

@@ -27,9 +27,7 @@
         "Framework :: Plone :: Addon",
         "Framework :: Plone :: 6.0",
         "Programming Language :: Python",
-        "Programming Language :: Python :: 3.7",
-        "Programming Language :: Python :: 3.8",
-        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
         "Operating System :: OS Independent",
         "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
     ],
@@ -56,7 +54,7 @@
         "design.plone.contenttypes>=6.0.0.dev0",
         "collective.feedback",
         "collective.volto.dropdownmenu",
-        "collective.volto.formsupport[honeypot]>=3.2.0",
+        "collective.volto.formsupport[honeypot]>=3.2.0,<=3.3.0",
         "collective.volto.secondarymenu",
         "collective.volto.socialsettings",
         "collective.volto.slimheader",

src/design/plone/policy/patches/collective_volto_formsupport.py

@@ -106,6 +106,23 @@ def reply(self):
     """
     This code is a copy of the original reply method from collective.volto.formsupport v3.2.2
     """
+    if not self.block:
+        # formsupport 3.3.0 compatibility
+        from collective.volto.formsupport.interfaces import IPostAdapter
+
+        self.form_data_adapter = getMultiAdapter(
+            (self.context, self.request), IPostAdapter
+        )
+        self.form_data = self.get_form_data()
+        # fix attachment fields
+        if self.form_data.get("attachments"):
+            for k, v in self.form_data["attachments"].items():
+                if "field_id" not in v:
+                    v["field_id"] = k
+        self.block_id = self.form_data.get("block_id", "")
+        if self.block_id:
+            self.block = self.get_block_data(block_id=self.block_id)
+
     store_action = self.block.get("store", False)
     send_action = self.block.get("send", [])
     self.submit_limit = int(self.block.get("limit", "-1"))  # this is the patch

test_plone60.cfg

@@ -9,81 +9,3 @@ extends =
 update-versions-file = test_plone60.cfg
 
 [versions]
-# to remove when released
-collective.volto.formsupport = 3.2.2
-
-# Added by buildout at 2021-12-29 11:05:41.321569
-flake8 = 6.0.0
-flake8-coding = 1.3.2
-flake8-debugger = 4.1.2
-flake8-print = 5.0.0
-mccabe = 0.7.0
-plone.recipe.codeanalysis = 3.0.1
-pyflakes = 3.0.1
-zpretty = 3.0.1
-
-# Required by:
-# flake8-debugger==3.2.1
-# flake8-print==3.1.4
-pycodestyle = 2.10.0
-
-# Added by buildout at 2023-01-12 09:16:52.328614
-bleach = 5.0.1
-build = 0.9.0
-commonmark = 0.9.1
-i18ndude = 5.3.4
-keyring = 23.11.0
-pep517 = 0.13.0
-pkginfo = 1.8.3
-readme-renderer = 37.3
-requests-toolbelt = 0.10.1
-rfc3986 = 2.0.0
-rich = 13.3.1
-pygments = 2.14.0
-twine = 4.0.1
-zest.releaser = 7.3.0
-
-# Required by:
-# plone.recipe.codeanalysis==3.0.1
-check-manifest = 0.48
-
-# Required by:
-# zest.releaser==7.2.0
-colorama = 0.4.6
-
-# Required by:
-# keyring==23.11.0
-jaraco.classes = 3.2.3
-
-# Required by:
-# jaraco.classes==3.2.3
-more-itertools = 9.0.0
-
-# Required by:
-# check-manifest==0.48
-tomli = 2.0.1
-
-# Required by:
-# bleach==5.0.1
-webencodings = 0.5.1
-
-dataclasses = 0.8
-
-# Added by buildout at 2023-02-20 14:52:32.917956
-backports.functools-lru-cache = 1.6.4
-markdown-it-py = 2.1.0
-mdurl = 0.1.2
-pkgutil-resolve-name = 1.3.10
-
-# Required by:
-# PasteDeploy==3.0.1
-# plone.restapi==8.33.3
-importlib-metadata = 5.2.0
-
-# Added by buildout at 2023-03-01 12:57:48.164146
-coverage = 7.0.5
-createcoverage = 1.5
-
-# temporary version
-collective.taxonomy = 3.1.5
-collective.volto.blocksfield = 2.2.0