-
-
Notifications
You must be signed in to change notification settings - Fork 74
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[fc] Repository: Products.CMFPlacefulWorkflow
Branch: refs/heads/master Date: 2025-01-20T18:02:18+01:00 Author: Maurits van Rees (mauritsvanrees) <[email protected]> Commit: plone/Products.CMFPlacefulWorkflow@8229874 Fix DeprecationWarnings. Files changed: A news/4090.bugfix M Products/CMFPlacefulWorkflow/testing.py M Products/CMFPlacefulWorkflow/tests/policy_form.txt M Products/CMFPlacefulWorkflow/tests/test_configlet.py Repository: Products.CMFPlacefulWorkflow Branch: refs/heads/master Date: 2025-01-21T15:54:58+01:00 Author: Gil Forcada Codinachs (gforcada) <[email protected]> Commit: plone/Products.CMFPlacefulWorkflow@89918f7 Merge pull request #70 from plone/maurits-warnings Fix DeprecationWarnings. Files changed: A news/4090.bugfix M Products/CMFPlacefulWorkflow/testing.py M Products/CMFPlacefulWorkflow/tests/policy_form.txt M Products/CMFPlacefulWorkflow/tests/test_configlet.py
- Loading branch information
Showing
1 changed file
with
18 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,46 +1,38 @@ | ||
| Repository: plone.api | ||
| Repository: Products.CMFPlacefulWorkflow | ||
|
|
||
|
|
||
| Branch: refs/heads/main | ||
| Date: 2025-01-20T18:19:44+01:00 | ||
| Branch: refs/heads/master | ||
| Date: 2025-01-20T18:02:18+01:00 | ||
| Author: Maurits van Rees (mauritsvanrees) <[email protected]> | ||
| Commit: https://github.com/plone/plone.api/commit/68c4e5233d22ee5d347619852534687c5481c08e | ||
| Commit: https://github.com/plone/Products.CMFPlacefulWorkflow/commit/822987456f7385bb7713c242fc56c7c399a80d8c | ||
|
|
||
| Fix DeprecationWarnings. | ||
|
|
||
| Files changed: | ||
| A news/4090.bugfix | ||
| M docs/portal.md | ||
| M setup.py | ||
| M src/plone/api/portal.py | ||
| M src/plone/api/relation.py | ||
| M src/plone/api/testing.zcml | ||
| M src/plone/api/tests/test_content.py | ||
| M src/plone/api/tests/test_portal.py | ||
| M Products/CMFPlacefulWorkflow/testing.py | ||
| M Products/CMFPlacefulWorkflow/tests/policy_form.txt | ||
| M Products/CMFPlacefulWorkflow/tests/test_configlet.py | ||
|
|
||
| b'diff --git a/docs/portal.md b/docs/portal.md\nindex ae2d6003..1288277e 100644\n--- a/docs/portal.md\n+++ b/docs/portal.md\n@@ -45,7 +45,7 @@ Assuming there is a document `english_page` in a folder `en`, which is the navig\n % invisible-code-block: python\n %\n % from plone import api\n-% from plone.app.layout.navigation.interfaces import INavigationRoot\n+% from plone.base.interfaces import INavigationRoot\n % from zope.interface import alsoProvides\n %\n % portal = api.portal.get()\ndiff --git a/news/4090.bugfix b/news/4090.bugfix\nnew file mode 100644\nindex 00000000..8528aefb\n--- /dev/null\n+++ b/news/4090.bugfix\n@@ -0,0 +1 @@\n+Fix DeprecationWarnings. [maurits]\ndiff --git a/setup.py b/setup.py\nindex 51612921..5c161a85 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -36,8 +36,8 @@\n "plone.app.uuid",\n "plone.app.dexterity",\n "plone.app.intid",\n- "plone.app.layout",\n "plone.app.linkintegrity",\n+ "plone.base",\n "plone.dexterity",\n "plone.i18n",\n "plone.registry",\ndiff --git a/src/plone/api/portal.py b/src/plone/api/portal.py\nindex 6080093f..cdbe8bd5 100644\n--- a/src/plone/api/portal.py\n+++ b/src/plone/api/portal.py\n@@ -7,7 +7,7 @@\n from plone.api.exc import CannotGetPortalError\n from plone.api.exc import InvalidParameterError\n from plone.api.validation import required_parameters\n-from plone.app.layout.navigation.root import getNavigationRootObject\n+from plone.base.navigationroot import get_navigation_root_object\n from plone.registry.interfaces import IRegistry\n from Products.CMFCore.interfaces import ISiteRoot\n from Products.CMFCore.utils import getToolByName\n@@ -86,7 +86,7 @@ def get_navigation_root(context=None):\n :Example: :ref:`portal-get-navigation-root-example`\n """\n context = aq_inner(context)\n- return getNavigationRootObject(context, get())\n+ return get_navigation_root_object(context, get())\n \n \n @required_parameters("name")\ndiff --git a/src/plone/api/relation.py b/src/plone/api/relation.py\nindex 1b0bda97..a01f8b9f 100644\n--- a/src/plone/api/relation.py\n+++ b/src/plone/api/relation.py\n@@ -10,8 +10,8 @@\n from plone.api.validation import required_parameters\n from plone.app.linkintegrity.handlers import modifiedContent\n from plone.app.linkintegrity.utils import referencedRelationship\n+from plone.base.utils import base_hasattr\n from plone.dexterity.utils import iterSchemataForType\n-from Products.CMFPlone.utils import base_hasattr\n from z3c.relationfield import event\n from z3c.relationfield import RelationValue\n from z3c.relationfield.schema import Relation\ndiff --git a/src/plone/api/testing.zcml b/src/plone/api/testing.zcml\nindex 1a9fbf15..d0f05fa2 100644\n--- a/src/plone/api/testing.zcml\n+++ b/src/plone/api/testing.zcml\n@@ -14,7 +14,7 @@\n title="plone.api: Test fixture"\n description="Extension profile to configure a test fixture"\n provides="Products.GenericSetup.interfaces.EXTENSION"\n- for="Products.CMFPlone.interfaces.ITestCasePloneSiteRoot"\n+ for="plone.base.interfaces.ITestCasePloneSiteRoot"\n directory="profiles/testfixture"\n />\n \ndiff --git a/src/plone/api/tests/test_content.py b/src/plone/api/tests/test_content.py\nindex 4e9b701b..44109d95 100644\n--- a/src/plone/api/tests/test_content.py\n+++ b/src/plone/api/tests/test_content.py\n@@ -8,9 +8,9 @@\n from plone.api.content import _parse_object_provides_query\n from plone.api.tests.base import INTEGRATION_TESTING\n from plone.app.contenttypes.interfaces import IFolder\n-from plone.app.layout.navigation.interfaces import INavigationRoot\n from plone.app.linkintegrity.exceptions import LinkIntegrityNotificationException\n from plone.app.textfield import RichTextValue\n+from plone.base.interfaces import INavigationRoot\n from plone.indexer import indexer\n from plone.uuid.interfaces import IMutableUUID\n from plone.uuid.interfaces import IUUIDGenerator\n@@ -192,7 +192,7 @@ def test_create_constraints(self):\n folder.setConstrainTypesMode(ENABLED)\n folder.setLocallyAllowedTypes(("News Item",))\n else: # DX\n- from Products.CMFPlone.interfaces import ISelectableConstrainTypes\n+ from plone.base.interfaces import ISelectableConstrainTypes\n \n constraints = ISelectableConstrainTypes(folder)\n constraints.setConstrainTypesMode(ENABLED)\ndiff --git a/src/plone/api/tests/test_portal.py b/src/plone/api/tests/test_portal.py\nindex 32bfa810..844bc4e7 100644\n--- a/src/plone/api/tests/test_portal.py\n+++ b/src/plone/api/tests/test_portal.py\n@@ -7,7 +7,7 @@\n from plone.api import env\n from plone.api import portal\n from plone.api.tests.base import INTEGRATION_TESTING\n-from plone.app.layout.navigation.interfaces import INavigationRoot\n+from plone.base.interfaces import INavigationRoot\n from plone.registry import field\n from plone.registry.interfaces import IRegistry\n from plone.registry.record import Record\n' | ||
| b'diff --git a/Products/CMFPlacefulWorkflow/testing.py b/Products/CMFPlacefulWorkflow/testing.py\nindex f9d5752..7f268f2 100644\n--- a/Products/CMFPlacefulWorkflow/testing.py\n+++ b/Products/CMFPlacefulWorkflow/testing.py\n@@ -5,7 +5,7 @@\n from plone.app.testing import PloneSandboxLayer\n from plone.app.testing import SITE_OWNER_NAME\n from plone.app.testing import SITE_OWNER_PASSWORD\n-from plone.testing import z2\n+from plone.testing import zope\n from Products.CMFCore.interfaces import ISiteRoot\n from Products.GenericSetup import EXTENSION\n from Products.GenericSetup import profile_registry\n@@ -30,7 +30,7 @@ def setUpZope(self, app, configurationContext):\n profile_type=EXTENSION,\n for_=ISiteRoot,\n )\n- z2.installProduct(app, "Products.CMFPlacefulWorkflow")\n+ zope.installProduct(app, "Products.CMFPlacefulWorkflow")\n \n def setUpPloneSite(self, portal):\n portal.acl_users.userFolderAddUser(\ndiff --git a/Products/CMFPlacefulWorkflow/tests/policy_form.txt b/Products/CMFPlacefulWorkflow/tests/policy_form.txt\nindex c95e25f..4fd1ba2 100644\n--- a/Products/CMFPlacefulWorkflow/tests/policy_form.txt\n+++ b/Products/CMFPlacefulWorkflow/tests/policy_form.txt\n@@ -22,7 +22,7 @@ Create some content\n \n Open a browser and log in as a user who can use the policy form.\n \n- >>> from plone.testing.z2 import Browser\n+ >>> from plone.testing.zope import Browser\n >>> browser = Browser(layer[\'app\'])\n >>> browser.open(portal.absolute_url())\n >>> browser.getLink(\'Log in\').click()\ndiff --git a/Products/CMFPlacefulWorkflow/tests/test_configlet.py b/Products/CMFPlacefulWorkflow/tests/test_configlet.py\nindex d6e79ed..db398ff 100644\n--- a/Products/CMFPlacefulWorkflow/tests/test_configlet.py\n+++ b/Products/CMFPlacefulWorkflow/tests/test_configlet.py\n@@ -22,7 +22,7 @@\n from plone.app.testing import SITE_OWNER_NAME\n from plone.app.testing import SITE_OWNER_PASSWORD\n from plone.app.testing import TEST_USER_ID\n-from plone.testing.z2 import Browser\n+from plone.testing.zope import Browser\n from Products.CMFCore.utils import getToolByName\n from Products.CMFPlacefulWorkflow.tests.CMFPlacefulWorkflowTestCase import ( # noqa: E501\n CMFPlacefulWorkflowTestCase,\ndiff --git a/news/4090.bugfix b/news/4090.bugfix\nnew file mode 100644\nindex 0000000..8528aef\n--- /dev/null\n+++ b/news/4090.bugfix\n@@ -0,0 +1 @@\n+Fix DeprecationWarnings. [maurits]\n' | ||
|
|
||
| Repository: plone.api | ||
| Repository: Products.CMFPlacefulWorkflow | ||
|
|
||
|
|
||
| Branch: refs/heads/main | ||
| Date: 2025-01-21T15:53:10+01:00 | ||
| Branch: refs/heads/master | ||
| Date: 2025-01-21T15:54:58+01:00 | ||
| Author: Gil Forcada Codinachs (gforcada) <[email protected]> | ||
| Commit: https://github.com/plone/plone.api/commit/eb1012bfb2d6d7848f920d504b4e2965a58eadcc | ||
| Commit: https://github.com/plone/Products.CMFPlacefulWorkflow/commit/89918f7482dc5ad5e6bfc2a086dca01f61f7fd56 | ||
|
|
||
| Merge pull request #554 from plone/maurits-warnings | ||
| Merge pull request #70 from plone/maurits-warnings | ||
|
|
||
| Fix DeprecationWarnings. | ||
|
|
||
| Files changed: | ||
| A news/4090.bugfix | ||
| M docs/portal.md | ||
| M setup.py | ||
| M src/plone/api/portal.py | ||
| M src/plone/api/relation.py | ||
| M src/plone/api/testing.zcml | ||
| M src/plone/api/tests/test_content.py | ||
| M src/plone/api/tests/test_portal.py | ||
|
|
||
| b'diff --git a/docs/portal.md b/docs/portal.md\nindex ae2d6003..1288277e 100644\n--- a/docs/portal.md\n+++ b/docs/portal.md\n@@ -45,7 +45,7 @@ Assuming there is a document `english_page` in a folder `en`, which is the navig\n % invisible-code-block: python\n %\n % from plone import api\n-% from plone.app.layout.navigation.interfaces import INavigationRoot\n+% from plone.base.interfaces import INavigationRoot\n % from zope.interface import alsoProvides\n %\n % portal = api.portal.get()\ndiff --git a/news/4090.bugfix b/news/4090.bugfix\nnew file mode 100644\nindex 00000000..8528aefb\n--- /dev/null\n+++ b/news/4090.bugfix\n@@ -0,0 +1 @@\n+Fix DeprecationWarnings. [maurits]\ndiff --git a/setup.py b/setup.py\nindex 51612921..5c161a85 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -36,8 +36,8 @@\n "plone.app.uuid",\n "plone.app.dexterity",\n "plone.app.intid",\n- "plone.app.layout",\n "plone.app.linkintegrity",\n+ "plone.base",\n "plone.dexterity",\n "plone.i18n",\n "plone.registry",\ndiff --git a/src/plone/api/portal.py b/src/plone/api/portal.py\nindex 6080093f..cdbe8bd5 100644\n--- a/src/plone/api/portal.py\n+++ b/src/plone/api/portal.py\n@@ -7,7 +7,7 @@\n from plone.api.exc import CannotGetPortalError\n from plone.api.exc import InvalidParameterError\n from plone.api.validation import required_parameters\n-from plone.app.layout.navigation.root import getNavigationRootObject\n+from plone.base.navigationroot import get_navigation_root_object\n from plone.registry.interfaces import IRegistry\n from Products.CMFCore.interfaces import ISiteRoot\n from Products.CMFCore.utils import getToolByName\n@@ -86,7 +86,7 @@ def get_navigation_root(context=None):\n :Example: :ref:`portal-get-navigation-root-example`\n """\n context = aq_inner(context)\n- return getNavigationRootObject(context, get())\n+ return get_navigation_root_object(context, get())\n \n \n @required_parameters("name")\ndiff --git a/src/plone/api/relation.py b/src/plone/api/relation.py\nindex 1b0bda97..a01f8b9f 100644\n--- a/src/plone/api/relation.py\n+++ b/src/plone/api/relation.py\n@@ -10,8 +10,8 @@\n from plone.api.validation import required_parameters\n from plone.app.linkintegrity.handlers import modifiedContent\n from plone.app.linkintegrity.utils import referencedRelationship\n+from plone.base.utils import base_hasattr\n from plone.dexterity.utils import iterSchemataForType\n-from Products.CMFPlone.utils import base_hasattr\n from z3c.relationfield import event\n from z3c.relationfield import RelationValue\n from z3c.relationfield.schema import Relation\ndiff --git a/src/plone/api/testing.zcml b/src/plone/api/testing.zcml\nindex 1a9fbf15..d0f05fa2 100644\n--- a/src/plone/api/testing.zcml\n+++ b/src/plone/api/testing.zcml\n@@ -14,7 +14,7 @@\n title="plone.api: Test fixture"\n description="Extension profile to configure a test fixture"\n provides="Products.GenericSetup.interfaces.EXTENSION"\n- for="Products.CMFPlone.interfaces.ITestCasePloneSiteRoot"\n+ for="plone.base.interfaces.ITestCasePloneSiteRoot"\n directory="profiles/testfixture"\n />\n \ndiff --git a/src/plone/api/tests/test_content.py b/src/plone/api/tests/test_content.py\nindex 4e9b701b..44109d95 100644\n--- a/src/plone/api/tests/test_content.py\n+++ b/src/plone/api/tests/test_content.py\n@@ -8,9 +8,9 @@\n from plone.api.content import _parse_object_provides_query\n from plone.api.tests.base import INTEGRATION_TESTING\n from plone.app.contenttypes.interfaces import IFolder\n-from plone.app.layout.navigation.interfaces import INavigationRoot\n from plone.app.linkintegrity.exceptions import LinkIntegrityNotificationException\n from plone.app.textfield import RichTextValue\n+from plone.base.interfaces import INavigationRoot\n from plone.indexer import indexer\n from plone.uuid.interfaces import IMutableUUID\n from plone.uuid.interfaces import IUUIDGenerator\n@@ -192,7 +192,7 @@ def test_create_constraints(self):\n folder.setConstrainTypesMode(ENABLED)\n folder.setLocallyAllowedTypes(("News Item",))\n else: # DX\n- from Products.CMFPlone.interfaces import ISelectableConstrainTypes\n+ from plone.base.interfaces import ISelectableConstrainTypes\n \n constraints = ISelectableConstrainTypes(folder)\n constraints.setConstrainTypesMode(ENABLED)\ndiff --git a/src/plone/api/tests/test_portal.py b/src/plone/api/tests/test_portal.py\nindex 32bfa810..844bc4e7 100644\n--- a/src/plone/api/tests/test_portal.py\n+++ b/src/plone/api/tests/test_portal.py\n@@ -7,7 +7,7 @@\n from plone.api import env\n from plone.api import portal\n from plone.api.tests.base import INTEGRATION_TESTING\n-from plone.app.layout.navigation.interfaces import INavigationRoot\n+from plone.base.interfaces import INavigationRoot\n from plone.registry import field\n from plone.registry.interfaces import IRegistry\n from plone.registry.record import Record\n' | ||
| M Products/CMFPlacefulWorkflow/testing.py | ||
| M Products/CMFPlacefulWorkflow/tests/policy_form.txt | ||
| M Products/CMFPlacefulWorkflow/tests/test_configlet.py | ||
|
|
||
| b'diff --git a/Products/CMFPlacefulWorkflow/testing.py b/Products/CMFPlacefulWorkflow/testing.py\nindex f9d5752..7f268f2 100644\n--- a/Products/CMFPlacefulWorkflow/testing.py\n+++ b/Products/CMFPlacefulWorkflow/testing.py\n@@ -5,7 +5,7 @@\n from plone.app.testing import PloneSandboxLayer\n from plone.app.testing import SITE_OWNER_NAME\n from plone.app.testing import SITE_OWNER_PASSWORD\n-from plone.testing import z2\n+from plone.testing import zope\n from Products.CMFCore.interfaces import ISiteRoot\n from Products.GenericSetup import EXTENSION\n from Products.GenericSetup import profile_registry\n@@ -30,7 +30,7 @@ def setUpZope(self, app, configurationContext):\n profile_type=EXTENSION,\n for_=ISiteRoot,\n )\n- z2.installProduct(app, "Products.CMFPlacefulWorkflow")\n+ zope.installProduct(app, "Products.CMFPlacefulWorkflow")\n \n def setUpPloneSite(self, portal):\n portal.acl_users.userFolderAddUser(\ndiff --git a/Products/CMFPlacefulWorkflow/tests/policy_form.txt b/Products/CMFPlacefulWorkflow/tests/policy_form.txt\nindex c95e25f..4fd1ba2 100644\n--- a/Products/CMFPlacefulWorkflow/tests/policy_form.txt\n+++ b/Products/CMFPlacefulWorkflow/tests/policy_form.txt\n@@ -22,7 +22,7 @@ Create some content\n \n Open a browser and log in as a user who can use the policy form.\n \n- >>> from plone.testing.z2 import Browser\n+ >>> from plone.testing.zope import Browser\n >>> browser = Browser(layer[\'app\'])\n >>> browser.open(portal.absolute_url())\n >>> browser.getLink(\'Log in\').click()\ndiff --git a/Products/CMFPlacefulWorkflow/tests/test_configlet.py b/Products/CMFPlacefulWorkflow/tests/test_configlet.py\nindex d6e79ed..db398ff 100644\n--- a/Products/CMFPlacefulWorkflow/tests/test_configlet.py\n+++ b/Products/CMFPlacefulWorkflow/tests/test_configlet.py\n@@ -22,7 +22,7 @@\n from plone.app.testing import SITE_OWNER_NAME\n from plone.app.testing import SITE_OWNER_PASSWORD\n from plone.app.testing import TEST_USER_ID\n-from plone.testing.z2 import Browser\n+from plone.testing.zope import Browser\n from Products.CMFCore.utils import getToolByName\n from Products.CMFPlacefulWorkflow.tests.CMFPlacefulWorkflowTestCase import ( # noqa: E501\n CMFPlacefulWorkflowTestCase,\ndiff --git a/news/4090.bugfix b/news/4090.bugfix\nnew file mode 100644\nindex 0000000..8528aef\n--- /dev/null\n+++ b/news/4090.bugfix\n@@ -0,0 +1 @@\n+Fix DeprecationWarnings. [maurits]\n' | ||
|
|