Merge pull request #717 from plone/maurits-warnings

Fix DeprecationWarnings.
plone · Jan 22, 2025 · 5c5f3bd · 5c5f3bd
2 parents 030c680 + d2d300e
commit 5c5f3bd
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/news/4090.bugfix b/news/4090.bugfix
@@ -0,0 +1 @@
+Fix DeprecationWarnings. [maurits]
diff --git a/plone/app/contenttypes/schema/link.xml b/plone/app/contenttypes/schema/link.xml
@@ -6,7 +6,7 @@
        i18n:domain="plone"
 >
   <schema>
-    <field form:widget="plone.app.z3cform.widget.LinkFieldWidget"
+    <field form:widget="plone.app.z3cform.widgets.link.LinkFieldWidget"
            name="remoteUrl"
            type="zope.schema.TextLine"
     >

diff --git a/plone/app/contenttypes/tests/test_collection.py b/plone/app/contenttypes/tests/test_collection.py
@@ -7,7 +7,6 @@
 from plone.app.contenttypes.testing import PLONE_APP_CONTENTTYPES_FUNCTIONAL_TESTING
 from plone.app.contenttypes.testing import PLONE_APP_CONTENTTYPES_INTEGRATION_TESTING
 from plone.app.contenttypes.testing import set_browserlayer
-from plone.app.layout.navigation.interfaces import INavigationRoot
 from plone.app.testing import login
 from plone.app.testing import logout
 from plone.app.testing import setRoles
@@ -16,6 +15,7 @@
 from plone.app.testing import TEST_USER_ID
 from plone.app.testing import TEST_USER_NAME
 from plone.app.textfield.value import RichTextValue
+from plone.base.interfaces.siteroot import INavigationRoot
 from plone.dexterity.interfaces import IDexterityFTI
 from plone.testing.zope import Browser
 from transaction import commit

diff --git a/plone/app/contenttypes/tests/test_link.py b/plone/app/contenttypes/tests/test_link.py
@@ -14,7 +14,7 @@
 from plone.app.testing import TEST_USER_ID
 from plone.app.z3cform.converters import LinkWidgetDataConverter
 from plone.app.z3cform.interfaces import IPloneFormLayer
-from plone.app.z3cform.widget import LinkWidget
+from plone.app.z3cform.widgets.link import LinkWidget
 from plone.dexterity.interfaces import IDexterityFTI
 from plone.testing.zope import Browser
 from plone.uuid.interfaces import IUUID