Merge pull request #554 from plone/maurits-warnings

Fix DeprecationWarnings.

docs/portal.md

@@ -45,7 +45,7 @@ Assuming there is a document `english_page` in a folder `en`, which is the navig
 % invisible-code-block: python
 %
 % from plone import api
-% from plone.app.layout.navigation.interfaces import INavigationRoot
+% from plone.base.interfaces import INavigationRoot
 % from zope.interface import alsoProvides
 %
 % portal = api.portal.get()

news/4090.bugfix

@@ -0,0 +1 @@
+Fix DeprecationWarnings. [maurits]

setup.py

@@ -36,8 +36,8 @@
         "plone.app.uuid",
         "plone.app.dexterity",
         "plone.app.intid",
-        "plone.app.layout",
         "plone.app.linkintegrity",
+        "plone.base",
         "plone.dexterity",
         "plone.i18n",
         "plone.registry",

src/plone/api/portal.py

@@ -7,7 +7,7 @@
 from plone.api.exc import CannotGetPortalError
 from plone.api.exc import InvalidParameterError
 from plone.api.validation import required_parameters
-from plone.app.layout.navigation.root import getNavigationRootObject
+from plone.base.navigationroot import get_navigation_root_object
 from plone.registry.interfaces import IRegistry
 from Products.CMFCore.interfaces import ISiteRoot
 from Products.CMFCore.utils import getToolByName
@@ -86,7 +86,7 @@ def get_navigation_root(context=None):
     :Example: :ref:`portal-get-navigation-root-example`
     """
     context = aq_inner(context)
-    return getNavigationRootObject(context, get())
+    return get_navigation_root_object(context, get())
 
 
 @required_parameters("name")

src/plone/api/relation.py

@@ -10,8 +10,8 @@
 from plone.api.validation import required_parameters
 from plone.app.linkintegrity.handlers import modifiedContent
 from plone.app.linkintegrity.utils import referencedRelationship
+from plone.base.utils import base_hasattr
 from plone.dexterity.utils import iterSchemataForType
-from Products.CMFPlone.utils import base_hasattr
 from z3c.relationfield import event
 from z3c.relationfield import RelationValue
 from z3c.relationfield.schema import Relation

src/plone/api/testing.zcml

@@ -14,7 +14,7 @@
       title="plone.api: Test fixture"
       description="Extension profile to configure a test fixture"
       provides="Products.GenericSetup.interfaces.EXTENSION"
-      for="Products.CMFPlone.interfaces.ITestCasePloneSiteRoot"
+      for="plone.base.interfaces.ITestCasePloneSiteRoot"
       directory="profiles/testfixture"
       />
 

src/plone/api/tests/test_content.py

@@ -8,9 +8,9 @@
 from plone.api.content import _parse_object_provides_query
 from plone.api.tests.base import INTEGRATION_TESTING
 from plone.app.contenttypes.interfaces import IFolder
-from plone.app.layout.navigation.interfaces import INavigationRoot
 from plone.app.linkintegrity.exceptions import LinkIntegrityNotificationException
 from plone.app.textfield import RichTextValue
+from plone.base.interfaces import INavigationRoot
 from plone.indexer import indexer
 from plone.uuid.interfaces import IMutableUUID
 from plone.uuid.interfaces import IUUIDGenerator
@@ -192,7 +192,7 @@ def test_create_constraints(self):
             folder.setConstrainTypesMode(ENABLED)
             folder.setLocallyAllowedTypes(("News Item",))
         else:  # DX
-            from Products.CMFPlone.interfaces import ISelectableConstrainTypes
+            from plone.base.interfaces import ISelectableConstrainTypes
 
             constraints = ISelectableConstrainTypes(folder)
             constraints.setConstrainTypesMode(ENABLED)

src/plone/api/tests/test_portal.py

@@ -7,7 +7,7 @@
 from plone.api import env
 from plone.api import portal
 from plone.api.tests.base import INTEGRATION_TESTING
-from plone.app.layout.navigation.interfaces import INavigationRoot
+from plone.base.interfaces import INavigationRoot
 from plone.registry import field
 from plone.registry.interfaces import IRegistry
 from plone.registry.record import Record