-
-
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: plone.app.contenttypes
Branch: refs/heads/master Date: 2025-01-20T18:16:34+01:00 Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org> Commit: plone/plone.app.contenttypes@d2d300e Fix DeprecationWarnings. Files changed: A news/4090.bugfix M plone/app/contenttypes/schema/link.xml M plone/app/contenttypes/tests/test_collection.py M plone/app/contenttypes/tests/test_link.py Repository: plone.app.contenttypes Branch: refs/heads/master Date: 2025-01-21T18:04:00-08:00 Author: David Glick (davisagli) <david@glicksoftware.com> Commit: plone/plone.app.contenttypes@5c5f3bd Merge pull request #717 from plone/maurits-warnings Fix DeprecationWarnings. Files changed: A news/4090.bugfix M plone/app/contenttypes/schema/link.xml M plone/app/contenttypes/tests/test_collection.py M plone/app/contenttypes/tests/test_link.py
- Loading branch information
Showing
1 changed file
with
15 additions
and
15 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,38 +1,38 @@ | ||
| Repository: plone.portlets | ||
| Repository: plone.app.contenttypes | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2025-01-20T21:34:55+01:00 | ||
| Date: 2025-01-20T18:16:34+01:00 | ||
| Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org> | ||
| Commit: https://github.com/plone/plone.portlets/commit/822e037981d562378d1ba84f1caa888f61749b5d | ||
| Commit: https://github.com/plone/plone.app.contenttypes/commit/d2d300e42ab2b8c73b6f19173e069c673316ed1d | ||
|
|
||
| Fix DeprecationWarnings. | ||
|
|
||
| Files changed: | ||
| A news/4090.bugfix | ||
| M plone/portlets/assignable.py | ||
| M plone/portlets/settings.py | ||
| M plone/portlets/storage.py | ||
| M plone/app/contenttypes/schema/link.xml | ||
| M plone/app/contenttypes/tests/test_collection.py | ||
| M plone/app/contenttypes/tests/test_link.py | ||
|
|
||
| b'diff --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]\ndiff --git a/plone/portlets/assignable.py b/plone/portlets/assignable.py\nindex 049ac6d..1d1dc6f 100644\n--- a/plone/portlets/assignable.py\n+++ b/plone/portlets/assignable.py\n@@ -1,5 +1,5 @@\n from BTrees.OOBTree import OOBTree\n-from persistent.dict import PersistentDict\n+from persistent.mapping import PersistentMapping\n from plone.portlets.constants import CONTEXT_ASSIGNMENT_KEY\n from plone.portlets.constants import CONTEXT_BLACKLIST_STATUS_KEY\n from plone.portlets.constants import CONTEXT_CATEGORY\n@@ -68,13 +68,13 @@ def _getBlacklist(self, create=False):\n local = annotations.get(CONTEXT_BLACKLIST_STATUS_KEY, None)\n if local is None:\n if create:\n- local = annotations[CONTEXT_BLACKLIST_STATUS_KEY] = PersistentDict()\n+ local = annotations[CONTEXT_BLACKLIST_STATUS_KEY] = PersistentMapping()\n else:\n return None\n blacklist = local.get(self.manager.__name__, None)\n if blacklist is None:\n if create:\n- blacklist = local[self.manager.__name__] = PersistentDict()\n+ blacklist = local[self.manager.__name__] = PersistentMapping()\n else:\n return None\n return blacklist\ndiff --git a/plone/portlets/settings.py b/plone/portlets/settings.py\nindex dc5456f..a06f58b 100644\n--- a/plone/portlets/settings.py\n+++ b/plone/portlets/settings.py\n@@ -1,4 +1,4 @@\n-from persistent.dict import PersistentDict\n+from persistent.mapping import PersistentMapping\n from plone.portlets.constants import ASSIGNMENT_SETTINGS_KEY\n from plone.portlets.interfaces import IPortletAssignment\n from plone.portlets.interfaces import IPortletAssignmentSettings\n@@ -12,7 +12,7 @@\n @implementer(IPortletAssignmentSettings)\n class PortletAssignmentSettings(Contained):\n def __init__(self):\n- self.data = PersistentDict()\n+ self.data = PersistentMapping()\n \n def __setitem__(self, name, value):\n self.data[name] = value\ndiff --git a/plone/portlets/storage.py b/plone/portlets/storage.py\nindex e2c58ca..334d973 100644\n--- a/plone/portlets/storage.py\n+++ b/plone/portlets/storage.py\n@@ -74,7 +74,7 @@ class PortletAssignmentMapping(OrderedContainer):\n \n def __init__(self, manager="", category="", name=""):\n # XXX: This depends on implementation detail in OrderedContainer,\n- # but it uses a PersistentDict, which sucks :-/\n+ # but it uses a PersistentMapping, which sucks :-/\n OrderedContainer.__init__(self)\n self._data = OOBTree()\n \n' | ||
| b'diff --git a/news/4090.bugfix b/news/4090.bugfix\nnew file mode 100644\nindex 000000000..8528aefbe\n--- /dev/null\n+++ b/news/4090.bugfix\n@@ -0,0 +1 @@\n+Fix DeprecationWarnings. [maurits]\ndiff --git a/plone/app/contenttypes/schema/link.xml b/plone/app/contenttypes/schema/link.xml\nindex 972c389f6..f1ecf87ee 100644\n--- a/plone/app/contenttypes/schema/link.xml\n+++ b/plone/app/contenttypes/schema/link.xml\n@@ -6,7 +6,7 @@\n i18n:domain="plone"\n >\n <schema>\n- <field form:widget="plone.app.z3cform.widget.LinkFieldWidget"\n+ <field form:widget="plone.app.z3cform.widgets.link.LinkFieldWidget"\n name="remoteUrl"\n type="zope.schema.TextLine"\n >\ndiff --git a/plone/app/contenttypes/tests/test_collection.py b/plone/app/contenttypes/tests/test_collection.py\nindex a851b008c..9c344c423 100644\n--- a/plone/app/contenttypes/tests/test_collection.py\n+++ b/plone/app/contenttypes/tests/test_collection.py\n@@ -7,7 +7,6 @@\n from plone.app.contenttypes.testing import PLONE_APP_CONTENTTYPES_FUNCTIONAL_TESTING\n from plone.app.contenttypes.testing import PLONE_APP_CONTENTTYPES_INTEGRATION_TESTING\n from plone.app.contenttypes.testing import set_browserlayer\n-from plone.app.layout.navigation.interfaces import INavigationRoot\n from plone.app.testing import login\n from plone.app.testing import logout\n from plone.app.testing import setRoles\n@@ -16,6 +15,7 @@\n from plone.app.testing import TEST_USER_ID\n from plone.app.testing import TEST_USER_NAME\n from plone.app.textfield.value import RichTextValue\n+from plone.base.interfaces.siteroot import INavigationRoot\n from plone.dexterity.interfaces import IDexterityFTI\n from plone.testing.zope import Browser\n from transaction import commit\ndiff --git a/plone/app/contenttypes/tests/test_link.py b/plone/app/contenttypes/tests/test_link.py\nindex dabdd9a81..de8000ef9 100644\n--- a/plone/app/contenttypes/tests/test_link.py\n+++ b/plone/app/contenttypes/tests/test_link.py\n@@ -14,7 +14,7 @@\n from plone.app.testing import TEST_USER_ID\n from plone.app.z3cform.converters import LinkWidgetDataConverter\n from plone.app.z3cform.interfaces import IPloneFormLayer\n-from plone.app.z3cform.widget import LinkWidget\n+from plone.app.z3cform.widgets.link import LinkWidget\n from plone.dexterity.interfaces import IDexterityFTI\n from plone.testing.zope import Browser\n from plone.uuid.interfaces import IUUID\n' | ||
|
|
||
| Repository: plone.portlets | ||
| Repository: plone.app.contenttypes | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2025-01-21T18:00:54-08:00 | ||
| Date: 2025-01-21T18:04:00-08:00 | ||
| Author: David Glick (davisagli) <david@glicksoftware.com> | ||
| Commit: https://github.com/plone/plone.portlets/commit/886c2858e4b3a7470fec1483da356b6b43f42b72 | ||
| Commit: https://github.com/plone/plone.app.contenttypes/commit/5c5f3bd92c725a45acd6a939b016d949b0ad3544 | ||
|
|
||
| Merge pull request #28 from plone/maurits-warnings | ||
| Merge pull request #717 from plone/maurits-warnings | ||
|
|
||
| Fix DeprecationWarnings. | ||
|
|
||
| Files changed: | ||
| A news/4090.bugfix | ||
| M plone/portlets/assignable.py | ||
| M plone/portlets/settings.py | ||
| M plone/portlets/storage.py | ||
| M plone/app/contenttypes/schema/link.xml | ||
| M plone/app/contenttypes/tests/test_collection.py | ||
| M plone/app/contenttypes/tests/test_link.py | ||
|
|
||
| b'diff --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]\ndiff --git a/plone/portlets/assignable.py b/plone/portlets/assignable.py\nindex 049ac6d..1d1dc6f 100644\n--- a/plone/portlets/assignable.py\n+++ b/plone/portlets/assignable.py\n@@ -1,5 +1,5 @@\n from BTrees.OOBTree import OOBTree\n-from persistent.dict import PersistentDict\n+from persistent.mapping import PersistentMapping\n from plone.portlets.constants import CONTEXT_ASSIGNMENT_KEY\n from plone.portlets.constants import CONTEXT_BLACKLIST_STATUS_KEY\n from plone.portlets.constants import CONTEXT_CATEGORY\n@@ -68,13 +68,13 @@ def _getBlacklist(self, create=False):\n local = annotations.get(CONTEXT_BLACKLIST_STATUS_KEY, None)\n if local is None:\n if create:\n- local = annotations[CONTEXT_BLACKLIST_STATUS_KEY] = PersistentDict()\n+ local = annotations[CONTEXT_BLACKLIST_STATUS_KEY] = PersistentMapping()\n else:\n return None\n blacklist = local.get(self.manager.__name__, None)\n if blacklist is None:\n if create:\n- blacklist = local[self.manager.__name__] = PersistentDict()\n+ blacklist = local[self.manager.__name__] = PersistentMapping()\n else:\n return None\n return blacklist\ndiff --git a/plone/portlets/settings.py b/plone/portlets/settings.py\nindex dc5456f..a06f58b 100644\n--- a/plone/portlets/settings.py\n+++ b/plone/portlets/settings.py\n@@ -1,4 +1,4 @@\n-from persistent.dict import PersistentDict\n+from persistent.mapping import PersistentMapping\n from plone.portlets.constants import ASSIGNMENT_SETTINGS_KEY\n from plone.portlets.interfaces import IPortletAssignment\n from plone.portlets.interfaces import IPortletAssignmentSettings\n@@ -12,7 +12,7 @@\n @implementer(IPortletAssignmentSettings)\n class PortletAssignmentSettings(Contained):\n def __init__(self):\n- self.data = PersistentDict()\n+ self.data = PersistentMapping()\n \n def __setitem__(self, name, value):\n self.data[name] = value\ndiff --git a/plone/portlets/storage.py b/plone/portlets/storage.py\nindex e2c58ca..334d973 100644\n--- a/plone/portlets/storage.py\n+++ b/plone/portlets/storage.py\n@@ -74,7 +74,7 @@ class PortletAssignmentMapping(OrderedContainer):\n \n def __init__(self, manager="", category="", name=""):\n # XXX: This depends on implementation detail in OrderedContainer,\n- # but it uses a PersistentDict, which sucks :-/\n+ # but it uses a PersistentMapping, which sucks :-/\n OrderedContainer.__init__(self)\n self._data = OOBTree()\n \n' | ||
| b'diff --git a/news/4090.bugfix b/news/4090.bugfix\nnew file mode 100644\nindex 000000000..8528aefbe\n--- /dev/null\n+++ b/news/4090.bugfix\n@@ -0,0 +1 @@\n+Fix DeprecationWarnings. [maurits]\ndiff --git a/plone/app/contenttypes/schema/link.xml b/plone/app/contenttypes/schema/link.xml\nindex 972c389f6..f1ecf87ee 100644\n--- a/plone/app/contenttypes/schema/link.xml\n+++ b/plone/app/contenttypes/schema/link.xml\n@@ -6,7 +6,7 @@\n i18n:domain="plone"\n >\n <schema>\n- <field form:widget="plone.app.z3cform.widget.LinkFieldWidget"\n+ <field form:widget="plone.app.z3cform.widgets.link.LinkFieldWidget"\n name="remoteUrl"\n type="zope.schema.TextLine"\n >\ndiff --git a/plone/app/contenttypes/tests/test_collection.py b/plone/app/contenttypes/tests/test_collection.py\nindex a851b008c..9c344c423 100644\n--- a/plone/app/contenttypes/tests/test_collection.py\n+++ b/plone/app/contenttypes/tests/test_collection.py\n@@ -7,7 +7,6 @@\n from plone.app.contenttypes.testing import PLONE_APP_CONTENTTYPES_FUNCTIONAL_TESTING\n from plone.app.contenttypes.testing import PLONE_APP_CONTENTTYPES_INTEGRATION_TESTING\n from plone.app.contenttypes.testing import set_browserlayer\n-from plone.app.layout.navigation.interfaces import INavigationRoot\n from plone.app.testing import login\n from plone.app.testing import logout\n from plone.app.testing import setRoles\n@@ -16,6 +15,7 @@\n from plone.app.testing import TEST_USER_ID\n from plone.app.testing import TEST_USER_NAME\n from plone.app.textfield.value import RichTextValue\n+from plone.base.interfaces.siteroot import INavigationRoot\n from plone.dexterity.interfaces import IDexterityFTI\n from plone.testing.zope import Browser\n from transaction import commit\ndiff --git a/plone/app/contenttypes/tests/test_link.py b/plone/app/contenttypes/tests/test_link.py\nindex dabdd9a81..de8000ef9 100644\n--- a/plone/app/contenttypes/tests/test_link.py\n+++ b/plone/app/contenttypes/tests/test_link.py\n@@ -14,7 +14,7 @@\n from plone.app.testing import TEST_USER_ID\n from plone.app.z3cform.converters import LinkWidgetDataConverter\n from plone.app.z3cform.interfaces import IPloneFormLayer\n-from plone.app.z3cform.widget import LinkWidget\n+from plone.app.z3cform.widgets.link import LinkWidget\n from plone.dexterity.interfaces import IDexterityFTI\n from plone.testing.zope import Browser\n from plone.uuid.interfaces import IUUID\n' | ||
|
|