Black 24.4.2 (#1787)

* Upgrade Plone 6.0.7 to 6.0.11.1

* Add Plone 6.1

* Add changelog

* Pin Black==24.4.2

* Run black

constraints.txt

@@ -1,2 +1,2 @@
-black == 22.3.0
+black == 24.4.2
 flake8 == 4.0.1

plone-5.2.x.cfg

@@ -4,7 +4,6 @@ extends =
     base.cfg
 
 [versions]
-black = 22.3.0
 
 # we need the newest plone.rest release
 plone.rest = 3.0.1

plone-6.0.x.cfg

@@ -13,7 +13,6 @@ recipe = plone.recipe.zope2instance
 zodb-temporary-storage = off
 
 [versions]
-black = 22.3.0
 pygments = 2.14.0
 plone.app.linkintegrity = 4.0.3
 robotframework-browser = 17.5.2

src/plone/restapi/services/locking/__init__.py

@@ -1,5 +1,6 @@
 """ Locking
 """
+
 from datetime import datetime
 from datetime import timezone
 from plone import api

src/plone/restapi/services/relations/add.py

@@ -93,9 +93,7 @@ def reply(self):
                 msg = (
                     "Source and target not found."
                     if not source_obj and not target_obj
-                    else "Source not found."
-                    if not source_obj
-                    else "Target not found."
+                    else "Source not found." if not source_obj else "Target not found."
                 )
                 msg = f"Failed on creating a relation. {msg}"
                 log.error(f"{msg} {relationdata}")

src/plone/restapi/services/relations/delete.py

@@ -40,9 +40,11 @@ def reply(self):
                     msg = (
                         "Source and target not found."
                         if not source_obj and not target_obj
-                        else "Source not found."
-                        if not source_obj
-                        else "Target not found."
+                        else (
+                            "Source not found."
+                            if not source_obj
+                            else "Target not found."
+                        )
                     )
                     msg = f"Failed on deleting a relation. {msg}"
                     log.error(f"{msg} {relationdata}")

src/plone/restapi/services/types/get.py

@@ -76,9 +76,9 @@ def __call__(self, expand=False):
                 "id": fti.getId(),
                 "title": translate(fti.Title(), context=self.request),
                 "addable": fti.getId() in allowed_types if can_add else False,
-                "immediately_addable": fti.getId() in immediately_types
-                if can_add
-                else False,
+                "immediately_addable": (
+                    fti.getId() in immediately_types if can_add else False
+                ),
             }
             for fti in ftis
         ]

src/plone/restapi/tests/test_documentation.py

@@ -1710,9 +1710,9 @@ def test_update_with_lock(self):
             headers={"Lock-Token": token},
             json={"title": "New Title"},
         )
-        response.request.headers[
-            "Lock-Token"
-        ] = "0.684672730996-0.25195226375-00105A989226:1477076400.000"  # noqa
+        response.request.headers["Lock-Token"] = (
+            "0.684672730996-0.25195226375-00105A989226:1477076400.000"  # noqa
+        )
         save_request_and_response_for_docs("lock_update", response)
 
     def test_querystring_get(self):

src/plone/restapi/tests/test_services_contextnavigation.py

@@ -597,7 +597,7 @@ def testTopLevelWithNavigationRoot(self):
             self.portal.folder2.folder21,
             opts(
                 topLevel=1,
-                root_path="/folder2"
+                root_path="/folder2",
                 # self.portal.folder2.UID()
             ),
         )

src/plone/restapi/types/adapters.py

@@ -1,4 +1,5 @@
 """JsonSchema providers."""
+
 from plone.app.textfield.interfaces import IRichText
 from plone.restapi.types.interfaces import IJsonSchemaProvider
 from plone.restapi.types.utils import get_fieldsets

src/plone/restapi/types/interfaces.py

@@ -1,4 +1,5 @@
 """Interfaces."""
+
 from zope.interface import Interface
 
 

src/plone/restapi/types/utils.py

@@ -115,9 +115,11 @@ def get_form_fieldsets(form):
         fieldset = {
             "id": group.__name__,
             "title": translate(group.label, context=getRequest()),
-            "description": translate(group.description, context=getRequest())
-            if group.description is not None
-            else "",
+            "description": (
+                translate(group.description, context=getRequest())
+                if group.description is not None
+                else ""
+            ),
             "fields": list(group.fields.values()),
             "behavior": "plone",
         }