Merge pull request #179 from plone/maurits-warnings

Fix DeprecationWarnings.

news/4090.bugfix

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

src/plone/volto/behaviors/preview_link.py

@@ -1,5 +1,5 @@
 from plone import api
-from plone.app.z3cform.widget import RelatedItemsFieldWidget
+from plone.app.z3cform.widgets.relateditems import RelatedItemsFieldWidget
 from plone.autoform import directives
 from plone.autoform.interfaces import IFormFieldProvider
 from plone.base.interfaces import IImageScalesFieldAdapter

src/plone/volto/browser/breadcrumbs.py

@@ -1,10 +1,10 @@
 from Acquisition import aq_base
 from Acquisition import aq_inner
 from Acquisition import aq_parent
-from plone.app.layout.navigation.interfaces import INavigationRoot
-from plone.app.layout.navigation.root import getNavigationRoot
 from plone.base.defaultpage import check_default_page_via_view
 from plone.base.interfaces import IHideFromBreadcrumbs
+from plone.base.interfaces import INavigationRoot
+from plone.base.navigationroot import get_navigation_root
 from plone.base.utils import pretty_title_or_id
 from Products.CMFPlone.browser.interfaces import INavigationBreadcrumbs
 from Products.CMFPlone.browser.navigation import get_view_url
@@ -42,7 +42,7 @@ def breadcrumbs(self):
         if IHideFromBreadcrumbs.providedBy(context):
             return base
 
-        rootPath = getNavigationRoot(context)
+        rootPath = get_navigation_root(context)
         itemPath = "/".join(context.getPhysicalPath())
 
         # don't show default pages in breadcrumbs or pages above the navigation

src/plone/volto/browser/navigation.py

@@ -1,8 +1,8 @@
 from Acquisition import aq_inner
 from Missing import Missing
-from plone.app.layout.navigation.root import getNavigationRoot
 from plone.base import utils
 from plone.base.interfaces import INavigationSchema
+from plone.base.navigationroot import get_navigation_root
 from plone.registry.interfaces import IRegistry
 from Products.CMFCore.utils import getToolByName
 from Products.CMFPlone.browser.interfaces import INavigationTabs
@@ -28,7 +28,7 @@ def _getNavQuery(self):
         else:
             query = {}
 
-        query["path"] = {"query": getNavigationRoot(self.context), "depth": 1}
+        query["path"] = {"query": get_navigation_root(self.context), "depth": 1}
         query["portal_type"] = [t for t in navigation_settings.displayed_types]
         query["sort_on"] = navigation_settings.sort_tabs_on
         if navigation_settings.sort_tabs_reversed:

src/plone/volto/coresandbox/example.py

@@ -1,9 +1,9 @@
 from plone.app.textfield import RichText
 from plone.app.vocabularies.catalog import CatalogSource
 from plone.app.vocabularies.catalog import StaticCatalogVocabulary
-from plone.app.z3cform.widget import AjaxSelectFieldWidget
-from plone.app.z3cform.widget import RelatedItemsFieldWidget
-from plone.app.z3cform.widget import SelectFieldWidget
+from plone.app.z3cform.widgets.relateditems import RelatedItemsFieldWidget
+from plone.app.z3cform.widgets.select import AjaxSelectFieldWidget
+from plone.app.z3cform.widgets.select import Select2FieldWidget
 from plone.autoform import directives
 from plone.dexterity.content import Container
 from plone.namedfile.field import NamedBlobFile
@@ -183,7 +183,7 @@ class IExample(model.Schema):
         required=False,
     )
 
-    directives.widget(choice_field_select=SelectFieldWidget)
+    directives.widget(choice_field_select=Select2FieldWidget)
     choice_field_select = schema.Choice(
         title="Choicefield with select2 widget",
         description="zope.schema.Choice",
@@ -214,7 +214,7 @@ class IExample(model.Schema):
         default=[],
     )
 
-    directives.widget(list_field_select=SelectFieldWidget)
+    directives.widget(list_field_select=Select2FieldWidget)
     list_field_select = schema.List(
         title="List field with select widget",
         description="zope.schema.List",
@@ -437,7 +437,7 @@ class IExample(model.Schema):
     )
     directives.widget(
         "relationchoice_field_select",
-        SelectFieldWidget,
+        Select2FieldWidget,
     )
 
     relationchoice_field_radio = RelationChoice(
@@ -465,7 +465,7 @@ class IExample(model.Schema):
     )
     directives.widget(
         "relationlist_field_select",
-        SelectFieldWidget,
+        Select2FieldWidget,
         pattern_options={
             "closeOnSelect": False,  # Select2 option to leave dropdown open for multiple selection
         },
@@ -620,7 +620,7 @@ class IExample(model.Schema):
     )
     directives.widget(
         "uuid_choice_field_select",
-        SelectFieldWidget,
+        Select2FieldWidget,
     )
 
     uuid_choice_field_radio = schema.Choice(
@@ -648,7 +648,7 @@ class IExample(model.Schema):
     )
     directives.widget(
         "uuid_list_field_select",
-        SelectFieldWidget,
+        Select2FieldWidget,
         pattern_options={
             "closeOnSelect": False,  # Select2 option to leave dropdown open for multiple selection
         },

src/plone/volto/profiles/default/registry.xml

@@ -2,7 +2,7 @@
 <registry>
   <!-- This is for the elements in the root, not show the current item in navigation-->
   <record field="show_excluded_items"
-          interface="Products.CMFPlone.interfaces.controlpanel.INavigationSchema"
+          interface="plone.base.interfaces.INavigationSchema"
           name="plone.show_excluded_items"
   >
     <value>False</value>
@@ -14,7 +14,7 @@
 </records>
 
   <record field="types_use_view_action_in_listings"
-          interface="Products.CMFPlone.interfaces.controlpanel.ITypesSchema"
+          interface="plone.base.interfaces.ITypesSchema"
           name="plone.types_use_view_action_in_listings"
           purge="true"
   >
@@ -23,7 +23,7 @@
 
   <!-- Allowed sizes -->
   <record field="allowed_sizes"
-          interface="Products.CMFPlone.interfaces.controlpanel.IImagingSchema"
+          interface="plone.base.interfaces.IImagingSchema"
           name="plone.allowed_sizes"
           purge="True"
   >

src/plone/volto/testing.py

@@ -7,7 +7,7 @@
 from plone.app.testing import setRoles
 from plone.app.testing import TEST_USER_ID
 from plone.distribution.testing.layer import PloneDistributionFixture
-from plone.testing import z2
+from plone.testing import zope
 
 import plone.app.caching  # noQA
 import plone.app.discussion  # noQA
@@ -62,13 +62,17 @@ class PloneVoltoCoreLayer(PloneSandboxLayer):
 
 
 PLONE_VOLTO_CORE_FUNCTIONAL_TESTING = FunctionalTesting(
-    bases=(PLONE_VOLTO_CORE_FIXTURE, z2.ZSERVER_FIXTURE),
+    bases=(PLONE_VOLTO_CORE_FIXTURE, zope.WSGI_SERVER_FIXTURE),
     name="PloneVoltoCoreLayer:FunctionalTesting",
 )
 
 
 PLONE_VOLTO_CORE_ACCEPTANCE_TESTING = FunctionalTesting(
-    bases=(PLONE_VOLTO_CORE_FIXTURE, REMOTE_LIBRARY_BUNDLE_FIXTURE, z2.ZSERVER_FIXTURE),
+    bases=(
+        PLONE_VOLTO_CORE_FIXTURE,
+        REMOTE_LIBRARY_BUNDLE_FIXTURE,
+        zope.WSGI_SERVER_FIXTURE,
+    ),
     name="PloneVoltoCoreLayer:AcceptanceTesting",
 )
 
@@ -108,7 +112,7 @@ def setUpPloneSite(self, portal):
 
 
 PLONE_VOLTO_CORESANDBOX_FUNCTIONAL_TESTING = FunctionalTesting(
-    bases=(PLONE_VOLTO_CORESANDBOX_FIXTURE, z2.ZSERVER_FIXTURE),
+    bases=(PLONE_VOLTO_CORESANDBOX_FIXTURE, zope.WSGI_SERVER_FIXTURE),
     name="PloneVoltoCoreSandboxLayer:FunctionalTesting",
 )
 
@@ -117,7 +121,7 @@ def setUpPloneSite(self, portal):
     bases=(
         PLONE_VOLTO_CORESANDBOX_FIXTURE,
         REMOTE_LIBRARY_BUNDLE_FIXTURE,
-        z2.ZSERVER_FIXTURE,
+        zope.WSGI_SERVER_FIXTURE,
     ),
     name="PloneVoltoCoreSandboxLayer:AcceptanceTesting",
 )
@@ -144,6 +148,6 @@ def setUpPloneSite(self, portal):
 
 
 PLONE_VOLTO_MIGRATION_FUNCTIONAL_TESTING = FunctionalTesting(
-    bases=(PLONE_VOLTO_MIGRATION_FIXTURE, z2.ZSERVER_FIXTURE),
+    bases=(PLONE_VOLTO_MIGRATION_FIXTURE, zope.WSGI_SERVER_FIXTURE),
     name="PloneVoltoMigrationLayer:FunctionalTesting",
 )