Merge branch 'main' into facet_count

.github/workflows/black.yml

@@ -7,15 +7,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.8]
+        python-version: [3.12]
 
     steps:
       # git checkout
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       # python setup
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           cache: pip

.github/workflows/flake8.yml

@@ -7,15 +7,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.8]
+        python-version: [3.11]
 
     steps:
       # git checkout
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       # python setup
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           cache: pip

.github/workflows/pyroma.yml

@@ -7,15 +7,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.8]
+        python-version: [3.12]
 
     steps:
       # git checkout
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       # python setup
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           cache: pip

.github/workflows/tests.yml

@@ -22,11 +22,11 @@ jobs:
             plone-version: "6.0"
     steps:
       # git checkout
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       # python setup
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           cache: "pip"
@@ -54,7 +54,7 @@ jobs:
 
       # build sphinx
       - name: sphinx
-        run: if [ "${{ matrix.plone-version }}" == "6.0" ] && [ ${{ matrix.python-version }} == '3.9' ]; then make docs-html; fi
+        run: if [ "${{ matrix.plone-version }}" == "6.0" ] && [ ${{ matrix.python-version }} == '3.12' ]; then make docs-html; fi
 
       # test
       - name: test
@@ -69,4 +69,4 @@ jobs:
 
       # test for broken links
       - name: linkcheck
-        run: if [ "${{ matrix.plone-version }}" == "6.0" ] && [ ${{ matrix.python-version }} == '3.9' ]; then make docs-linkcheckbroken; fi
+        run: if [ "${{ matrix.plone-version }}" == "6.0" ] && [ ${{ matrix.python-version }} == '3.12' ]; then make docs-linkcheckbroken; fi

.github/workflows/zpretty.yml

@@ -7,15 +7,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.8]
+        python-version: [3.12]
 
     steps:
       # git checkout
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       # python setup
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           cache: pip

news/1758.bugfix

@@ -0,0 +1 @@
+Use the ``mode`` parameter instead of ``direction`` when calling the ``scale`` method. Also change value to ``scale`. @wesleybl

news/1762.internal

@@ -0,0 +1 @@
+Bump all the versions in GitHub workflows. @stevepiercy

src/plone/restapi/__init__.py

@@ -1,12 +1,14 @@
 from . import patches  # noqa: ignore=F401
 from AccessControl import allow_module
 from AccessControl.Permissions import add_user_folders
+from importlib import import_module
 from plone.restapi.pas import plugin
 from Products.PluggableAuthService.PluggableAuthService import registerMultiPlugin
 from zope.i18nmessageid import MessageFactory
 
 import pkg_resources
 
+
 try:
     pkg_resources.get_distribution("plone.app.multilingual")
     HAS_MULTILINGUAL = True
@@ -19,6 +21,11 @@
 
 allow_module("json")
 
+# BBB: Plone 5.2
+HAS_PLONE_6 = getattr(
+    import_module("Products.CMFPlone.factory"), "PLONE60MARKER", False
+)
+
 
 def initialize(context):
     registerMultiPlugin(plugin.JWTAuthenticationPlugin.meta_type)

src/plone/restapi/imaging.py

@@ -1,8 +1,17 @@
+from plone.restapi import HAS_PLONE_6
 from zope.component import getMultiAdapter
 from zope.component import getUtility
 from zope.globalrequest import getRequest
 
 
+if HAS_PLONE_6:
+    # In Plone 6.0+, we must use the mode parameter
+    scale_parameter = {"mode": "scale"}
+else:
+    # BBB: In Plone 5.2, it is necessary to use the direction parameter.
+    scale_parameter = {"direction": "thumbnail"}
+
+
 def get_scales(context, field, width, height):
     """Get a dictionary of available scales for a particular image field,
     with the actual dimensions (aspect ratio of the original image).
@@ -51,9 +60,8 @@ def get_original_image_url(context, fieldname, width, height):
     scale_flags = {}
     if hasattr(images_view, "picture"):
         scale_flags["pre"] = True
-    scale = images_view.scale(
-        fieldname, width=width, height=height, direction="thumbnail", **scale_flags
-    )
+    parameters = {**scale_flags, **scale_parameter}
+    scale = images_view.scale(fieldname, width=width, height=height, **parameters)
     if scale:
         return scale.url
     # Corrupt images may not have a scale.