Merge pull request #480 from plone/maurits-warnings

Fix DeprecationWarnings.

news/4090.bugfix

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

src/plone/app/multilingual/browser/configure.zcml

@@ -186,7 +186,7 @@
   <!-- Selector -->
   <browser:page
       name="multilingual-selector"
-      for="plone.app.layout.navigation.interfaces.INavigationRoot"
+      for="plone.base.interfaces.INavigationRoot"
       class=".helper_views.selector_view"
       permission="zope.Public"
       layer="..interfaces.IPloneAppMultilingualInstalled"

src/plone/app/multilingual/browser/helper_views.py

@@ -1,6 +1,5 @@
 from AccessControl.SecurityManagement import getSecurityManager
 from Acquisition import aq_chain
-from plone.app.layout.navigation.interfaces import INavigationRoot
 from plone.app.multilingual.browser.selector import addQuery
 from plone.app.multilingual.browser.selector import NOT_TRANSLATED_YET_TEMPLATE
 from plone.app.multilingual.interfaces import ILanguageRootFolder
@@ -9,6 +8,7 @@
 from plone.app.multilingual.interfaces import ITranslatable
 from plone.app.multilingual.interfaces import ITranslationManager
 from plone.app.multilingual.manager import TranslationManager
+from plone.base.interfaces import INavigationRoot
 from plone.i18n.interfaces import INegotiateLanguage
 from plone.i18n.locales.interfaces import IContentLanguageAvailability
 from plone.registry.interfaces import IRegistry

src/plone/app/multilingual/browser/setup.py

@@ -1,12 +1,12 @@
 from logging import getLogger
 from plone.app.dexterity.behaviors.exclfromnav import IExcludeFromNavigation
-from plone.app.layout.navigation.interfaces import INavigationRoot
 from plone.app.multilingual import _
 from plone.app.multilingual.interfaces import ITranslatable
 from plone.app.multilingual.interfaces import ITranslationManager
 from plone.app.multilingual.interfaces import LANGUAGE_INDEPENDENT
 from plone.app.multilingual.subscriber import set_recursive_language
 from plone.base.interfaces import ILanguage
+from plone.base.interfaces import INavigationRoot
 from plone.base.utils import unrestricted_construct_instance
 from plone.dexterity.interfaces import IDexterityFTI
 from plone.i18n.locales.languages import _combinedlanguagelist

src/plone/app/multilingual/content/lrf.py

@@ -1,7 +1,7 @@
 from plone.app.content.namechooser import NormalizingNameChooser
-from plone.app.layout.navigation.interfaces import INavigationRoot
 from plone.app.multilingual.interfaces import ILanguageRootFolder
 from plone.app.multilingual.interfaces import ITranslationIdChooser
+from plone.base.interfaces import INavigationRoot
 from plone.dexterity.content import Container
 from zope.component import adapter
 from zope.container.interfaces import INameChooser

src/plone/app/multilingual/factory.py

@@ -6,7 +6,7 @@
 from plone.app.multilingual.interfaces import ITranslationIdChooser
 from plone.app.multilingual.interfaces import ITranslationLocator
 from plone.app.multilingual.interfaces import ITranslationManager
-from plone.base.interfaces.siteroot import IPloneSiteRoot
+from plone.base.interfaces import IPloneSiteRoot
 from zope.interface import implementer
 
 

src/plone/app/multilingual/tests/test_helper_views.py

@@ -9,7 +9,7 @@
 from plone.dexterity.utils import createContentInContainer
 from plone.i18n.interfaces import ILanguageSchema
 from plone.registry.interfaces import IRegistry
-from plone.testing.z2 import Browser
+from plone.testing.zope import Browser
 from zope.component import getUtility
 from zope.interface import alsoProvides
 

src/plone/app/multilingual/tests/test_selector.py

@@ -15,7 +15,7 @@
 from plone.dexterity.utils import createContentInContainer
 from plone.i18n.interfaces import ILanguageSchema
 from plone.registry.interfaces import IRegistry
-from plone.testing.z2 import Browser
+from plone.testing.zope import Browser
 from Products.CMFCore.utils import getToolByName
 from urllib.parse import parse_qs
 from urllib.parse import urlparse

src/plone/app/multilingual/tests/test_switcher.py

@@ -1,7 +1,7 @@
 from plone.app.multilingual.browser.setup import SetupMultilingualSite
 from plone.app.multilingual.interfaces import IPloneAppMultilingualInstalled
 from plone.app.multilingual.testing import PAM_FUNCTIONAL_TESTING
-from plone.testing.z2 import Browser
+from plone.testing.zope import Browser
 from Products.CMFCore.utils import getToolByName
 from zope.interface import alsoProvides