fix imports

plone · Sep 30, 2024 · b09a48f · b09a48f
1 parent f595e5f
commit b09a48f
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 14 deletions.
diff --git a/src/plone/app/standardtiles/contentlisting.py b/src/plone/app/standardtiles/contentlisting.py
@@ -3,12 +3,12 @@
 from plone.app.standardtiles import PloneMessageFactory as _
 from plone.app.z3cform.widget import QueryStringFieldWidget
 from plone.autoform.directives import widget
+from plone.base.utils import get_top_request
 from plone.registry.interfaces import IRegistry
 from plone.supermodel.model import Schema
 from plone.tiles import Tile
 from plone.tiles.interfaces import ITileType
 from Products.CMFCore.interfaces import IFolderish
-from Products.CMFPlone.utils import get_top_request
 from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
 from z3c.form.interfaces import IValue
 from z3c.form.util import getSpecification

diff --git a/src/plone/app/standardtiles/existingcontent.py b/src/plone/app/standardtiles/existingcontent.py
@@ -8,12 +8,12 @@
 from plone.app.standardtiles import PloneMessageFactory as _
 from plone.app.z3cform.widget import RelatedItemsFieldWidget
 from plone.autoform import directives as form
+from plone.base.utils import safe_text
 from plone.memoize.view import memoize
 from plone.registry.interfaces import IRegistry
 from plone.supermodel import model
 from plone.tiles import Tile
 from plone.uuid.interfaces import IUUID
-from Products.CMFPlone.utils import safe_unicode
 from repoze.xmliter.utils import getHTMLSerializer
 from z3c.form import validator
 from zExceptions import Unauthorized
@@ -223,7 +223,7 @@ def item_panels(self):
                     # after element is closed until last
                     # element of the root tree.
                     child_copy = copy.deepcopy(child)
-                    child_html = safe_unicode(serializer(child_copy))
+                    child_html = safe_text(serializer(child_copy))
                     panel_html.append(child_html)
                 panel_html = "".join(panel_html)
                 result.append(panel_html)

diff --git a/src/plone/app/standardtiles/html.py b/src/plone/app/standardtiles/html.py
@@ -1,11 +1,11 @@
 from plone.app.standardtiles import _PMF as _
+from plone.base.utils import safe_text
 from plone.subrequest import ISubRequest
 from plone.supermodel.directives import primary
 from plone.supermodel.model import Schema
 from plone.tiles import Tile
 from plone.tiles.directives import ignore_querystring
 from Products.CMFCore.utils import getToolByName
-from Products.CMFPlone.utils import safe_unicode
 from zope import schema
 
 
@@ -34,11 +34,11 @@ def __call__(self):
                 transforms = getToolByName(self.context, "portal_transforms")
                 data = transforms.convertTo(
                     "text/x-html-safe",
-                    safe_unicode(content),
+                    safe_text(content),
                     mimetype="text/html",
                     context=self.context,
                 )
                 content = data.getData()
         else:
             content = "<p></p>"
-        return f"<html><body>{safe_unicode(content)}</body></html>"
+        return f"<html><body>{safe_text(content)}</body></html>"
diff --git a/src/plone/app/standardtiles/navigation.py b/src/plone/app/standardtiles/navigation.py
@@ -8,6 +8,7 @@
 from plone.app.standardtiles import PloneMessageFactory as _
 from plone.app.vocabularies.catalog import CatalogSource as CatalogSourceBase
 from plone.base.defaultpage import is_default_page
+from plone.base.interfaces import INonStructuralFolder
 from plone.i18n.normalizer.interfaces import IIDNormalizer
 from plone.memoize.instance import memoize
 from plone.supermodel.model import Schema
@@ -18,7 +19,6 @@
 from Products.CMFDynamicViewFTI.interfaces import IBrowserDefault
 from Products.CMFPlone.browser.navtree import NavtreeQueryBuilder
 from Products.CMFPlone.browser.navtree import SitemapNavtreeStrategy
-from Products.CMFPlone.interfaces import INonStructuralFolder
 from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
 from z3c.form.interfaces import IValue
 from z3c.form.util import getSpecification

diff --git a/src/plone/app/standardtiles/setuphandlers.py b/src/plone/app/standardtiles/setuphandlers.py
@@ -1,5 +1,5 @@
+from plone.base.interfaces import INonInstallable
 from plone.registry.interfaces import IRegistry
-from Products.CMFPlone.interfaces import INonInstallable
 from zope.component import getUtility
 from zope.interface import implementer
 

diff --git a/src/plone/app/standardtiles/sitemap.py b/src/plone/app/standardtiles/sitemap.py
@@ -1,8 +1,8 @@
 from plone.app.standardtiles import PloneMessageFactory as _
 from plone.app.standardtiles.navigation import NavigationTile
+from plone.base.interfaces.controlpanel import INavigationSchema
 from plone.registry.interfaces import IRegistry
 from plone.supermodel.model import Schema
-from Products.CMFPlone.interfaces.controlpanel import INavigationSchema
 from zope import schema
 from zope.component import getUtility
 from zope.interface import implementer

diff --git a/src/plone/app/standardtiles/tests/test_head.py b/src/plone/app/standardtiles/tests/test_head.py
@@ -4,10 +4,10 @@
 from plone.app.testing import TEST_USER_ID
 from plone.app.testing import TEST_USER_NAME
 from plone.app.testing import TEST_USER_PASSWORD
+from plone.base.interfaces import ISecuritySchema
+from plone.base.interfaces import ISiteSchema
 from plone.registry.interfaces import IRegistry
 from plone.testing.zope import Browser
-from Products.CMFPlone.interfaces import ISecuritySchema
-from Products.CMFPlone.interfaces import ISiteSchema
 from unittest import TestCase
 from zope.component import getUtility
 

diff --git a/src/plone/app/standardtiles/tests/test_layout.py b/src/plone/app/standardtiles/tests/test_layout.py
@@ -5,11 +5,11 @@
 from plone.app.testing import TEST_USER_ID
 from plone.app.testing import TEST_USER_NAME
 from plone.app.testing import TEST_USER_PASSWORD
+from plone.base.interfaces import ISecuritySchema
+from plone.base.interfaces import ISiteSchema
 from plone.registry.interfaces import IRegistry
 from plone.testing.zope import Browser
 from Products.CMFCore.utils import getToolByName
-from Products.CMFPlone.interfaces import ISecuritySchema
-from Products.CMFPlone.interfaces import ISiteSchema
 from unittest import TestCase
 from zope.component import queryUtility
 

diff --git a/src/plone/app/standardtiles/tests/test_setup.py b/src/plone/app/standardtiles/tests/test_setup.py
@@ -1,6 +1,6 @@
 from plone.app.standardtiles.testing import PASTANDARDTILES_INTEGRATION_TESTING
+from plone.base.utils import get_installer
 from plone.registry.interfaces import IRegistry
-from Products.CMFPlone.utils import get_installer
 from zope.component import getUtility
 
 import unittest