Python 3.14 testing matrix, trove classifiers.

.github/workflows/test-matrix.yml

@@ -19,7 +19,7 @@ jobs:
         - ["ubuntu", "ubuntu-latest"]
         config:
         # [Python version, visual name, tox env]
-        - ["3.13", "6.2 on py3.13", "py313-plone62"]
+        - ["3.14", "6.2 on py3.14", "py314-plone62"]
         - ["3.10", "6.2 on py3.10", "py310-plone62"]
 
     runs-on: ${{ matrix.os[1] }}

.meta.toml

@@ -3,7 +3,7 @@
 # See the inline comments on how to expand/tweak this configuration file
 [meta]
 template = "default"
-commit-id = "2.3.2.dev0"
+commit-id = "2.3.3.dev0"
 
 [flake8]
 extra_lines = """

.pre-commit-config.yaml

@@ -12,11 +12,11 @@ repos:
     -   id: pyupgrade
         args: [--py38-plus]
 -   repo: https://github.com/pycqa/isort
-    rev: 7.0.0
+    rev: 8.0.1
     hooks:
     -   id: isort
 -   repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 25.12.0
+    rev: 26.3.0
     hooks:
     -   id: black
 -   repo: https://github.com/collective/zpretty
@@ -45,7 +45,7 @@ repos:
 #  """
 ##
 -   repo: https://github.com/codespell-project/codespell
-    rev: v2.4.1
+    rev: v2.4.2
     hooks:
     -   id: codespell
         additional_dependencies:

news/+meta.internal

@@ -0,0 +1 @@
+Update configuration files, add Python 3.14 to testing matrix and announce Python 3.14 in Trove classifiers. @plone

setup.py

@@ -1,7 +1,6 @@
 from pathlib import Path
 from setuptools import setup
 
-
 version = "6.2.0a2.dev0"
 
 long_description = (
@@ -28,6 +27,7 @@
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
         "Programming Language :: Python :: 3.13",
+        "Programming Language :: Python :: 3.14",
     ],
     python_requires=">=3.10",
     keywords="Plone CMF Python Zope CMS Webapplication",

src/Products/CMFPlone/CatalogTool.py

@@ -44,7 +44,6 @@
 import time
 import urllib
 
-
 logger = logging.getLogger("Plone")
 try:
     from plone.app.discussion.interfaces import DISCUSSION_ANNOTATION_KEY
@@ -510,10 +509,9 @@ def manage_catalogRebuild(self, RESPONSE=None, URL1=None):
         elapse = time.time() - elapse
         c_elapse = process_time() - c_elapse
 
-        msg = (
-            "Catalog Rebuilt\n"
-            "Total time: %s\n"
-            "Total CPU time: %s" % (repr(elapse), repr(c_elapse))
+        msg = "Catalog Rebuilt\nTotal time: {}\nTotal CPU time: {}".format(
+            repr(elapse),
+            repr(c_elapse),
         )
         logger.info(msg)
 

src/Products/CMFPlone/MigrationTool.py

@@ -20,7 +20,6 @@
 import sys
 import transaction
 
-
 logger = logging.getLogger("plone.app.upgrade")
 _upgradePaths = {}
 
@@ -332,7 +331,7 @@ def upgrade(self, REQUEST=None, dry_run=None, swallow_errors=True):
                         raise
                     except Exception:
                         logger.error(
-                            "Exception was thrown while cataloging:" "\n", exc_info=True
+                            "Exception was thrown while cataloging:\n", exc_info=True
                         )
                         if not swallow_errors:
                             raise
@@ -346,7 +345,7 @@ def upgrade(self, REQUEST=None, dry_run=None, swallow_errors=True):
                         raise
                     except Exception:
                         logger.error(
-                            "Exception was thrown while updating " "role mappings",
+                            "Exception was thrown while updating role mappings",
                             exc_info=True,
                         )
                         if not swallow_errors:

src/Products/CMFPlone/PasswordResetTool.py

@@ -22,7 +22,6 @@
 
 import datetime
 
-
 module_security = ModuleSecurityInfo("Products.CMFPlone.PasswordResetTool")
 
 

src/Products/CMFPlone/PloneBaseTool.py

@@ -10,7 +10,6 @@
 from zope.component import getMultiAdapter
 from zope.interface import implementer
 
-
 # getOAI() and getExprContext copied from CMF 1.5.1+cvs
 # Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
 # ZPL 2.1

src/Products/CMFPlone/PloneBatch.py

@@ -1,4 +1,3 @@
 from zope.deprecation import moved
 
-
 moved("plone.base.batch", "Version 7.0")

src/Products/CMFPlone/PloneTool.py

@@ -60,7 +60,6 @@
 import transaction
 import warnings
 
-
 _icons = {}
 
 CEILING_DATE = DateTime(2500, 0)  # never expires
@@ -467,7 +466,7 @@ def typesToList(self):
 
     @security.public
     def createBreadCrumbs(self, context, request=None):
-        # Returns a structure for the portal breadcumbs.
+        # Returns a structure for the portal breadcrumbs.
         if request is None:
             request = self.REQUEST
         return utils.createBreadCrumbs(context, request)
@@ -572,7 +571,7 @@ def addPortalMessage(self, message, type="info", request=None):
         # The arguments are:
         #     message:   a string, with the text message you want to show,
         #                or a HTML fragment (see type='structure' below)
-        #     type:      optional, defaults to 'info'. The type determines how
+        # type: optional, defaults to 'info'. The type determines how
         #                the message will be rendered, as it is used to select
         #                the CSS class for the message. Predefined types are:
         #                'info' - for informational messages

src/Products/CMFPlone/Portal.py

@@ -35,7 +35,6 @@
 from zope.interface.interfaces import ComponentLookupError
 from zope.traversing.interfaces import BeforeTraverseEvent
 
-
 if bbb.HAS_ZSERVER:
     from webdav.NullResource import NullResource
 

src/Products/CMFPlone/RegistrationTool.py

@@ -31,7 +31,6 @@
 import random
 import re
 
-
 try:
     # Products.MailHost has a patch to fix quoted-printable soft line breaks.
     # See https://github.com/zopefoundation/Products.MailHost/issues/35
@@ -132,7 +131,7 @@ def _getValidEmailAddress(self, member):
         # the template will be made with a blank To:, this is bad
         if email is None:
             msg = _(
-                "No email address is registered for member: " "${member_id}",
+                "No email address is registered for member: ${member_id}",
                 mapping={"member_id": member.getId()},
             )
             raise ValueError(msg)
@@ -195,9 +194,7 @@ def testPasswordValidity(self, password, confirm=None):
             return err
 
         if confirm is not None and confirm != password:
-            return _(
-                "Your password and confirmation did not match. " "Please try again."
-            )
+            return _("Your password and confirmation did not match. Please try again.")
         return None
 
     def pasValidation(self, property, password):

src/Products/CMFPlone/UnicodeSplitter/config.py

@@ -6,7 +6,6 @@
 
 import re
 
-
 STOP_WORD = []
 
 # Setting, adding langs.

src/Products/CMFPlone/UnicodeSplitter/splitter.py

@@ -4,6 +4,7 @@
 
 Created by Mikio Hokari, CMScom and Manabu Terada, CMScom on 2009-09-30.
 """
+
 from plone.i18n.normalizer.base import baseNormalize
 from Products.CMFPlone.UnicodeSplitter.config import pattern
 from Products.CMFPlone.UnicodeSplitter.config import pattern_g

src/Products/CMFPlone/WorkflowTool.py

@@ -13,7 +13,6 @@
 from ZODB.POSException import ConflictError
 from zope.component import getMultiAdapter
 
-
 try:
     multilingual_version = distribution("plone.app.multilingual").version
 except PackageNotFoundError:

src/Products/CMFPlone/__init__.py

@@ -6,7 +6,6 @@
 import warnings
 import zope.deferredimport
 
-
 __version__ = metadata("Products.CMFPlone")["version"]
 
 if __version__ < "7":

src/Products/CMFPlone/bbb.py

@@ -1,7 +1,6 @@
 from importlib.metadata import distribution
 from importlib.metadata import PackageNotFoundError
 
-
 HAS_ZSERVER = True
 try:
     dist = distribution("ZServer")

src/Products/CMFPlone/browser/admin.py

@@ -36,7 +36,6 @@
 
 import logging
 
-
 try:
     distribution("plone.volto")
     HAS_VOLTO = True
@@ -246,7 +245,7 @@ def __call__(self):
             # if it is because it is not installed until a plone site
             # is created
             if queryUtility(IKeyManager) is None:
-                LOGGER.info("CSRF protection disabled on initial site " "creation")
+                LOGGER.info("CSRF protection disabled on initial site creation")
             else:
                 # we have a keymanager, check csrf protection manually now
                 checkCSRF(self.request)

src/Products/CMFPlone/browser/author.py

@@ -23,7 +23,6 @@
 
 import logging
 
-
 logger = logging.getLogger("Plone")
 
 

src/Products/CMFPlone/browser/contact_info.py

@@ -15,7 +15,6 @@
 import logging
 import warnings
 
-
 try:
     # Products.MailHost has a patch to fix quoted-printable soft line breaks.
     # See https://github.com/zopefoundation/Products.MailHost/issues/35

src/Products/CMFPlone/browser/icons.py

@@ -10,7 +10,6 @@
 
 import logging
 
-
 logger = logging.getLogger(__name__)
 
 

src/Products/CMFPlone/browser/login/login.py

@@ -25,7 +25,6 @@
 
 import logging
 
-
 logger = logging.getLogger(__name__)
 # TODO: Scale down this list now that we've removed a lot of
 # templates.

src/Products/CMFPlone/browser/login/login_help.py

@@ -21,7 +21,6 @@
 
 import logging
 
-
 try:
     # Products.MailHost has a patch to fix quoted-printable soft line breaks.
     # See https://github.com/zopefoundation/Products.MailHost/issues/35

src/Products/CMFPlone/browser/login/password_reset.py

@@ -120,7 +120,7 @@ def _auto_login(self, userid, password):
             IStatusMessage(self.request).addStatusMessage(
                 _(
                     "password_reset_successful",
-                    default="Password reset successful, " "you are logged in now!",
+                    default="Password reset successful, you are logged in now!",
                 ),
                 "info",
             )

src/Products/CMFPlone/browser/login/utils.py

@@ -3,7 +3,6 @@
 
 import logging
 
-
 logger = logging.getLogger(__name__)
 
 

src/Products/CMFPlone/browser/navtree.py

@@ -17,7 +17,6 @@
 from zope.component import getUtility
 from zope.interface import implementer
 
-
 # Strategy objects for the navtree creation code. You can subclass these
 # to expand the default navtree behaviour, and pass instances of your
 # subclasses to buildFolderTree().

src/Products/CMFPlone/browser/ploneview.py

@@ -12,7 +12,6 @@
 from zope.interface import implementer
 from zope.size import byteDisplay
 
-
 _marker = []
 
 

src/Products/CMFPlone/browser/search.py

@@ -20,7 +20,6 @@
 import json
 import re
 
-
 _ = MessageFactory("plone")
 
 # We should accept both a simple space, unicode u'\u0020 but also a

src/Products/CMFPlone/browser/sendto.py

@@ -15,7 +15,6 @@
 
 import logging
 
-
 logger = logging.getLogger("Plone")
 
 

src/Products/CMFPlone/browser/syndication/adapters.py

@@ -183,7 +183,6 @@ def _brains(self):
 @adapter(IItem, IFeed)
 @implementer(IFeedItem)
 class BaseItem(BaseFeedData):
-
     def __init__(self, context, feed):
         self.context = context
         self.feed = feed
@@ -273,7 +272,6 @@ def file_type(self):
 
 @adapter(IDexterityContent, IFeed)
 class DexterityItem(BaseItem):
-
     file = None
     field_name = ""
 

src/Products/CMFPlone/browser/syndication/settings.py

@@ -8,7 +8,6 @@
 from zope.component import getUtility
 from zope.interface import implementer
 
-
 FEED_SETTINGS_KEY = "syndication_settings"
 
 

src/Products/CMFPlone/controlpanel/browser/filter.py

@@ -11,7 +11,7 @@ class FilterControlPanel(controlpanel.RegistryEditForm):
     id = "FilterControlPanel"
     label = _("HTML Filtering Settings")
     description = _(
-        "Keep in mind that editors like TinyMCE might have " "additional filters."
+        "Keep in mind that editors like TinyMCE might have additional filters."
     )
     schema = IFilterSchema
     schema_prefix = "plone"

src/Products/CMFPlone/controlpanel/browser/imaging.py

@@ -3,7 +3,6 @@
 from plone.base import PloneMessageFactory as _
 from plone.base.interfaces.controlpanel import IImagingSchema
 
-
 log = getLogger("Plone")
 
 

src/Products/CMFPlone/controlpanel/browser/language.py

@@ -10,7 +10,7 @@ class LanguageControlPanelForm(controlpanel.RegistryEditForm):
     label = _("heading_language_settings", default="Language Settings")
     description = _(
         "description_language_settings",
-        default="Settings related to interface languages and " "content translations.",
+        default="Settings related to interface languages and content translations.",
     )
 
     schema = ILanguageSchema

src/Products/CMFPlone/controlpanel/browser/mail.py

@@ -13,7 +13,6 @@
 import socket
 import sys
 
-
 log = getLogger("Plone")