Update deprecated imports for Plone 6.0 and higher.

Author: mauritsvanrees

CHANGES.rst

@@ -5,7 +5,7 @@ Changelog
 4.5.1 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Update deprecated imports for Plone 6.0 and higher.  [maurits]
 
 
 4.5.0 (2026-01-12)

src/collective/easyform/actions.py

@@ -45,7 +45,7 @@
 from plone.registry.interfaces import IRegistry
 from plone.supermodel.exportimport import BaseHandler
 from Products.CMFCore.utils import getToolByName
-from Products.CMFPlone.utils import safe_unicode
+from plone.base.utils import safe_text
 from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate
 from Products.PythonScripts.PythonScript import PythonScript
 from six import BytesIO
@@ -122,8 +122,8 @@ def serialize(self, field):
         if isinstance(field, (int, float, Decimal, bool)):
             return str(field)
         if isinstance(field, six.string_types):
-            return safe_unicode(field)
-        return safe_unicode(repr(field))
+            return safe_text(field)
+        return safe_text(repr(field))
 
     def onSuccess(self, fields, request):
         raise NotImplementedError(
@@ -291,9 +291,9 @@ def get_subject(self, fields, request, context):
                 subject = dollar_replacer(subject, fields)
 
         if isinstance(subject, six.string_types):
-            subject = safe_unicode(subject)
+            subject = safe_text(subject)
         elif subject and isinstance(subject, (set, tuple, list)):
-            subject = ", ".join([safe_unicode(s) for s in subject])
+            subject = ", ".join([safe_text(s) for s in subject])
         else:
             subject = nosubject
 
@@ -489,7 +489,7 @@ def get_mail_text(self, fields, request, context):
             getattr(self, "gpg_keyid", False) and "plain" or self.body_type or "html"
         )
         mime_text = MIMEText(
-            safe_unicode(body).encode(email_charset, "replace"),
+            safe_text(body).encode(email_charset, "replace"),
             _subtype=subtype,
             _charset=email_charset,
         )

src/collective/easyform/api.py

@@ -13,7 +13,7 @@
 from plone.supermodel.parser import SupermodelParseError
 from Products.CMFCore.Expression import Expression
 from Products.CMFCore.Expression import getExprContext
-from Products.CMFPlone.utils import safe_unicode
+from plone.base.utils import safe_text
 from re import compile
 from zope.schema import getFieldsInOrder
 
@@ -243,12 +243,12 @@ def cleanup(value):
     and returns a list of native strings.
     """
     if isinstance(value, six.string_types):
-        value = safe_unicode(value).strip()
+        value = safe_text(value).strip()
         value = value.replace(u",", u"\n").replace(u";", u"\n")
         value = [s for s in value.splitlines()]
 
     if isinstance(value, (list, tuple)):
-        value = [safe_unicode(s).strip() for s in value]
+        value = [safe_text(s).strip() for s in value]
 
     if six.PY2:
         # py2 expects a list of bytes

src/collective/easyform/browser/fields.py

@@ -16,7 +16,7 @@
 from plone.schemaeditor.browser.schema.listing import SchemaListingPage
 from plone.schemaeditor.browser.schema.traversal import SchemaContext
 from plone.supermodel.parser import SupermodelParseError
-from Products.CMFPlone.utils import safe_bytes
+from plone.base.utils import safe_bytes
 from Products.Five import BrowserView
 from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
 from z3c.form import button
@@ -26,7 +26,7 @@
 from zope.interface import implementer
 from ZPublisher.BaseRequest import DefaultPublishTraverse
 from Products.statusmessages.interfaces import IStatusMessage
-from Products.CMFPlone.utils import safe_unicode
+from plone.base.utils import safe_text
 
 import html
 
@@ -176,7 +176,7 @@ def __call__(self):
                 root = etree.fromstring(source, parser=parser)
             except etree.XMLSyntaxError as e:
                 IStatusMessage(self.request).addStatusMessage(
-                    "XMLSyntaxError: {0}".format(html.escape(safe_unicode(e.args[0]))),
+                    "XMLSyntaxError: {0}".format(html.escape(safe_text(e.args[0]))),
                     "error",
                 )
                 return super().__call__()

src/collective/easyform/browser/view.py

@@ -21,6 +21,7 @@
 from os.path import splitext
 from plone.app.z3cform.inline_validation import InlineValidationView
 from plone.autoform.form import AutoExtensibleForm
+from plone.base.utils import safe_bytes
 from plone.namedfile.interfaces import INamed
 from plone.z3cform.layout import FormWrapper
 from Products.Five import BrowserView
@@ -44,18 +45,6 @@
 logger = getLogger("collective.easyform")
 PMF = MessageFactory("plone")
 
-try:
-    from Products.CMFPlone.utils import safe_encode
-except ImportError:
-    # only thing needed to maintain 5.0.x compatibility
-    def safe_bytes(value, encoding="utf-8"):
-        """Convert text to bytes of the specified encoding."""
-        if isinstance(value, six.text_type):
-            value = value.encode(encoding)
-        return value
-
-    safe_encode = safe_bytes
-
 
 @implementer(IEasyFormForm)
 class EasyFormForm(AutoExtensibleForm, form.Form):
@@ -218,7 +207,7 @@ def handleSubmit(self, action):
         if thanksPageOverrideAction == "traverse_to":
             thanksPage = self.context.restrictedTraverse(thanksPage)
             thanksPage = mapply(thanksPage, self.request.args, self.request)
-            self.request.response.write(safe_encode(thanksPage))
+            self.request.response.write(safe_bytes(thanksPage))
 
     @button.buttonAndHandler(
         _(u"Reset"), name="reset", condition=lambda form: form.context.useCancelButton

src/collective/easyform/config.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from Products.CMFPlone.utils import safe_unicode
+from plone.base.utils import safe_text
 
 import os
 import pkg_resources
@@ -26,22 +26,22 @@
 with open(
     os.path.join(this_path, "default_schemata", "model_default.xml")
 ) as fp:  # noqa
-    MODEL_DEFAULT = safe_unicode(fp.read())
+    MODEL_DEFAULT = safe_text(fp.read())
 
 with open(
     os.path.join(this_path, "default_schemata", "fields_default.xml")
 ) as fp:  # noqa
-    FIELDS_DEFAULT = safe_unicode(fp.read())
+    FIELDS_DEFAULT = safe_text(fp.read())
 
 with open(
     os.path.join(this_path, "default_schemata", "actions_default.xml")
 ) as fp:  # noqa
-    ACTIONS_DEFAULT = safe_unicode(fp.read())
+    ACTIONS_DEFAULT = safe_text(fp.read())
 
 with open(
     os.path.join(this_path, "default_schemata", "mail_body_default.pt")
 ) as fp:  # noqa
-    MAIL_BODY_DEFAULT = safe_unicode(fp.read())
+    MAIL_BODY_DEFAULT = safe_text(fp.read())
 
 
 FORM_ERROR_MARKER = "FORM_ERROR_MARKER"

src/collective/easyform/interfaces/easyform.py

@@ -7,7 +7,7 @@
 from plone.autoform import directives
 from plone.supermodel.directives import fieldset
 from plone.supermodel.model import Schema
-from Products.CMFPlone.utils import safe_unicode
+from plone.base.utils import safe_text
 from zope.i18n import translate
 from zope.interface import Interface
 from zope.interface import provider
@@ -62,7 +62,7 @@ def default_actions(context):
         "easyform_default_actions.xml", default=None
     )
     if default_actions:
-        return safe_unicode(default_actions.file.data)
+        return safe_text(default_actions.file.data)
     else:
         return config.ACTIONS_DEFAULT
 
@@ -77,7 +77,7 @@ def default_fields(context):
         "easyform_default_fields.xml", default=None
     )
     if default_fields:
-        return safe_unicode(default_fields.file.data)
+        return safe_text(default_fields.file.data)
     else:
         return config.FIELDS_DEFAULT
 

src/collective/easyform/interfaces/mailer.py

@@ -9,7 +9,7 @@
 from plone.autoform import directives
 from plone.schema import Email
 from plone.supermodel.directives import fieldset
-from Products.CMFPlone.utils import safe_unicode
+from plone.base.utils import safe_text
 from z3c.form.browser.checkbox import CheckBoxFieldWidget
 from z3c.form.browser.textarea import TextAreaWidget
 from plone.autoform.interfaces import OMITTED_KEY
@@ -45,7 +45,7 @@ def default_mail_body():
         "easyform_mail_body_default.pt", default=None
     )
     if mail_body_default:
-        return safe_unicode(mail_body_default.file.data)
+        return safe_text(mail_body_default.file.data)
     else:
         return config.MAIL_BODY_DEFAULT
 

src/collective/easyform/serializer.py

@@ -26,7 +26,7 @@
 from collective.easyform.interfaces import IEasyForm
 from collective.easyform.interfaces import ILabel
 from collective.easyform.interfaces import ISaveData
-from Products.CMFPlone.utils import safe_unicode
+from plone.base.utils import safe_text
 
 
 logger = logging.getLogger("collective.easyform.migration")
@@ -107,7 +107,7 @@ def convertBeforeSerialize(value):
     elif isinstance(value, set):
         return list(value)
     elif isinstance(value, RichTextValue):
-        return safe_unicode(value.raw) #raw_encoded
+        return safe_text(value.raw) #raw_encoded
     else:
         return value
 

src/collective/easyform/tests/testMailer.py

@@ -14,7 +14,7 @@
 from plone import api
 from plone.app.textfield.value import RichTextValue
 from plone.namedfile.file import NamedFile
-from Products.CMFPlone.utils import safe_unicode
+from plone.base.utils import safe_text
 from six import BytesIO
 
 import datetime
@@ -310,7 +310,7 @@ def test_UTF8Subject(self):
         encoded_subject_header = msg["subject"]
         decoded_header = decode_header(encoded_subject_header)[0][0]
 
-        self.assertEqual(safe_unicode(decoded_header), utf8_subject)
+        self.assertEqual(safe_text(decoded_header), utf8_subject)
 
     def test_UnicodeSubject(self):
         """Test mailer with Unicode encoded subject line"""
@@ -328,7 +328,7 @@ def test_UnicodeSubject(self):
         encoded_subject_header = msg["subject"]
         decoded_header = decode_header(encoded_subject_header)[0][0]
 
-        self.assertEqual(safe_unicode(decoded_header), utf8_subject)
+        self.assertEqual(safe_text(decoded_header), utf8_subject)
 
     def test_Utf8ListSubject(self):
         """Test mailer with Unicode encoded subject line"""
@@ -345,7 +345,7 @@ def test_Utf8ListSubject(self):
         encoded_subject_header = msg["subject"]
         decoded_header = decode_header(encoded_subject_header)[0][0]
 
-        self.assertEqual(safe_unicode(decoded_header), ", ".join(utf8_subject_list))
+        self.assertEqual(safe_text(decoded_header), ", ".join(utf8_subject_list))
 
     def test_MailerOverrides(self):
         """Test mailer override functions"""