From eb3f5d384a823268115902d6cd26c9fdf1f4f478 Mon Sep 17 00:00:00 2001
From: Maurits van Rees <maurits@vanrees.org>
Date: Thu, 6 Jun 2024 16:45:06 +0200
Subject: [PATCH 1/2] Configuring with plone/meta

---
 .github/workflows/meta.yml | 7 +++++++
 .meta.toml                 | 5 ++++-
 .pre-commit-config.yaml    | 8 ++++----
 pyproject.toml             | 2 +-
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/meta.yml b/.github/workflows/meta.yml
index b8edec0..c9848bc 100644
--- a/.github/workflows/meta.yml
+++ b/.github/workflows/meta.yml
@@ -57,6 +57,13 @@ jobs:
 # os_dependencies = "git libxml2 libxslt"
 ##
 
+##
+# To test against a specific matrix of python versions
+# when running tests jobs, add in .meta.toml:
+# [github]
+# py_versions = "['3.12', '3.11']"
+##
+
 
 ##
 # Specify additional jobs in .meta.toml:
diff --git a/.meta.toml b/.meta.toml
index 3b50967..77440e5 100644
--- a/.meta.toml
+++ b/.meta.toml
@@ -3,8 +3,11 @@
 # See the inline comments on how to expand/tweak this configuration file
 [meta]
 template = "default"
-commit-id = "123ebc0a"
+commit-id = "a89af8f2"
 
 [pyproject]
 codespell_ignores = "complet,exemple"
 dependencies_ignores = "['Products.CMFPlone']"
+dependencies_mappings = [
+    "Pillow = ['PIL']",
+    ]
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index f857b48..da56023 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -7,7 +7,7 @@ ci:
 
 repos:
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v3.15.0
+    rev: v3.15.2
     hooks:
     -   id: pyupgrade
         args: [--py38-plus]
@@ -16,7 +16,7 @@ repos:
     hooks:
     -   id: isort
 -   repo: https://github.com/psf/black
-    rev: 24.1.1
+    rev: 24.4.2
     hooks:
     -   id: black
 -   repo: https://github.com/collective/zpretty
@@ -44,7 +44,7 @@ repos:
 #  """
 ##
 -   repo: https://github.com/codespell-project/codespell
-    rev: v2.2.6
+    rev: v2.3.0
     hooks:
     -   id: codespell
         additional_dependencies:
@@ -71,7 +71,7 @@ repos:
     -   id: check-python-versions
         args: ['--only', 'setup.py,pyproject.toml']
 -   repo: https://github.com/collective/i18ndude
-    rev: "6.1.0"
+    rev: "6.2.0"
     hooks:
     -   id: i18ndude
 
diff --git a/pyproject.toml b/pyproject.toml
index ff638be..d3a3ec7 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -71,7 +71,7 @@ target-version = ["py38"]
 ##
 
 [tool.codespell]
-ignore-words-list = "discreet,complet,exemple"
+ignore-words-list = "discreet,assertin,complet,exemple"
 skip = "*.po,"
 ##
 # Add extra configuration options in .meta.toml:

From b22b36432bb22a586995a8bb002a95514d98dcc3 Mon Sep 17 00:00:00 2001
From: Maurits van Rees <maurits@vanrees.org>
Date: Thu, 6 Jun 2024 17:17:37 +0200
Subject: [PATCH 2/2] Remove unused and broken member-registration control
 panel.

This still tried to use the ``portal_properties`` tool.
Since Plone 5.0 the ``member-fields`` control panel is used instead.
---
 news/127.bugfix                               |  4 +
 plone/app/users/browser/configure.zcml        |  7 --
 .../users/browser/registersettingspanel.py    | 81 -------------------
 3 files changed, 4 insertions(+), 88 deletions(-)
 create mode 100644 news/127.bugfix
 delete mode 100644 plone/app/users/browser/registersettingspanel.py

diff --git a/news/127.bugfix b/news/127.bugfix
new file mode 100644
index 0000000..4d34b45
--- /dev/null
+++ b/news/127.bugfix
@@ -0,0 +1,4 @@
+Remove unused and broken member-registration control panel.
+This still tried to use the ``portal_properties`` tool.
+Since Plone 5.0 the ``member-fields`` control panel is used instead.
+[maurits]
diff --git a/plone/app/users/browser/configure.zcml b/plone/app/users/browser/configure.zcml
index c02cf3f..3aa1203 100644
--- a/plone/app/users/browser/configure.zcml
+++ b/plone/app/users/browser/configure.zcml
@@ -11,13 +11,6 @@
       file="permissions.zcml"
       />
 
-  <browser:page
-      name="member-registration"
-      for="plone.base.interfaces.IPloneSiteRoot"
-      class=".registersettingspanel.RegistrationControlPanel"
-      permission="plone.app.controlpanel.UsersAndGroups"
-      />
-
   <browser:page
       name="register"
       for="plone.app.layout.navigation.interfaces.INavigationRoot"
diff --git a/plone/app/users/browser/registersettingspanel.py b/plone/app/users/browser/registersettingspanel.py
deleted file mode 100644
index 6aac69a..0000000
--- a/plone/app/users/browser/registersettingspanel.py
+++ /dev/null
@@ -1,81 +0,0 @@
-from plone.app.users.schema import IRegistrationSettingsSchema
-from plone.base import PloneMessageFactory as _
-from plone.protect import CheckAuthenticator
-from Products.CMFCore.utils import getToolByName
-from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
-from Products.statusmessages.interfaces import IStatusMessage
-from z3c.form import button
-from z3c.form import field
-from z3c.form import form
-from z3c.form.browser.orderedselect import OrderedSelectFieldWidget
-
-
-class RegistrationControlPanel(form.Form):
-    label = _("Users and Groups")
-    description = _("Registration settings for this site.")
-    form_name = _("Registration settings")
-    enableCSRFProtection = True
-
-    formErrorsMessage = _("There were errors.")
-    template = ViewPageTemplateFile("memberregistration.pt")
-
-    fields = field.Fields(IRegistrationSettingsSchema)
-    fields["user_registration_fields"].widgetFactory = OrderedSelectFieldWidget
-
-    def getContent(self):
-        props = self.props()
-        return {
-            "user_registration_fields": props.getProperty(
-                "user_registration_fields", []
-            )
-        }
-
-    @button.buttonAndHandler(
-        _("label_apply_changes", default="Apply changes"), name="save"
-    )
-    def action_save(self, action):
-        # CSRF protection
-        CheckAuthenticator(self.request)
-
-        data, errors = self.extractData()
-        if errors:
-            IStatusMessage(self.request).addStatusMessage(
-                self.formErrorsMessage, type="error"
-            )
-            return
-
-        # save property
-        if (
-            data["user_registration_fields"]
-            != self.getContent()["user_registration_fields"]
-        ):
-            props = self.props()
-            props._updateProperty(
-                "user_registration_fields", data["user_registration_fields"]
-            )
-            msg = _("Changes saved.")
-        else:
-            msg = _("No changes made.")
-        IStatusMessage(self.request).addStatusMessage(msg, type="info")
-
-    # @button.buttonAndHandler(
-    #     _(u'label_cancel', default=u'Cancel'), name='cancel'
-    # )
-    # def action_cancel(self, action):
-    #     IStatusMessage(self.request).addStatusMessage(
-    #         _("Changes canceled."), type="info"
-    #     )
-    #     url = getMultiAdapter(
-    #         (self.context, self.request),
-    #         name='absolute_url'
-    #     )()
-    #     self.request.response.redirect(url + '/@@overview-controlpanel')
-
-    def updateActions(self):
-        super().updateActions()
-        if self.actions and "save" in self.actions:
-            self.actions["save"].addclass("btn btn-primary")
-
-    def props(self):
-        pprop = getToolByName(self.context, "portal_properties")
-        return pprop.site_properties