feat: drop p.a.layout dependency

plone · Mar 25, 2023 · 24bd188 · 24bd188
1 parent 7685617
commit 24bd188
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/plone/app/contentlisting/contentlisting.py b/plone/app/contentlisting/contentlisting.py
@@ -1,8 +1,8 @@
 from Acquisition import aq_base
 from plone.app.contentlisting.interfaces import IContentListing
 from plone.app.contentlisting.interfaces import IContentListingObject
-from plone.app.layout.navigation.root import getNavigationRootObject
 from plone.base.interfaces import INavigationSchema
+from plone.base.navigationroot import get_navigation_root_object
 from plone.i18n.normalizer.interfaces import IIDNormalizer
 from plone.registry.interfaces import IRegistry
 from Products.CMFCore.utils import getToolByName
@@ -164,7 +164,7 @@ def MimeTypeIcon(self):
         mimeicon = None
         portal_url_object = getToolByName(self._brain, "portal_url")
         portal = portal_url_object.getPortalObject()
-        navroot = getNavigationRootObject(self._brain, portal)
+        navroot = get_navigation_root_object(self._brain, portal)
         contenttype = aq_base(
             getattr(self._brain, "mime_type", None),
         )

diff --git a/plone/app/contentlisting/tests/base.py b/plone/app/contentlisting/tests/base.py
@@ -11,9 +11,6 @@ class ContentListingLayer(PloneSandboxLayer):
     defaultBases = (PLONE_APP_CONTENTTYPES_FIXTURE,)
 
     def setUpZope(self, app, configurationContext):
-        import plone.app.layout
-
-        self.loadZCML(package=plone.app.layout)
         import plone.app.contentlisting
 
         self.loadZCML(package=plone.app.contentlisting)