[fc] Repository: plone.portlets

Branch: refs/heads/master Date: 2025-01-20T21:34:55+01:00 Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org> Commit: plone/plone.portlets@822e037 Fix DeprecationWarnings. Files changed: A news/4090.bugfix M plone/portlets/assignable.py M plone/portlets/settings.py M plone/portlets/storage.py Repository: plone.portlets Branch: refs/heads/master Date: 2025-01-21T18:00:54-08:00 Author: David Glick (davisagli) <david@glicksoftware.com> Commit: plone/plone.portlets@886c285 Merge pull request #28 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
plone · Jan 22, 2025 · e5d5da5 · e5d5da5
1 parent 654c7df
commit e5d5da5
Showing 1 changed file with 15 additions and 11 deletions.
diff --git a/last_commit.txt b/last_commit.txt
@@ -1,34 +1,38 @@
-Repository: plone.locking
+Repository: plone.portlets
 
 
 Branch: refs/heads/master
-Date: 2025-01-20T21:28:49+01:00
+Date: 2025-01-20T21:34:55+01:00
 Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
-Commit: https://github.com/plone/plone.locking/commit/0b051b10dede7af4bda40d22d2904f79090de6f0
+Commit: https://github.com/plone/plone.portlets/commit/822e037981d562378d1ba84f1caa888f61749b5d
 
 Fix DeprecationWarnings.
 
 Files changed:
 A news/4090.bugfix
-M plone/locking/lockable.py
+M plone/portlets/assignable.py
+M plone/portlets/settings.py
+M plone/portlets/storage.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/locking/lockable.py b/plone/locking/lockable.py\nindex e68b01d..b5c61f8 100644\n--- a/plone/locking/lockable.py\n+++ b/plone/locking/lockable.py\n@@ -1,5 +1,5 @@\n from AccessControl import getSecurityManager\n-from persistent.dict import PersistentDict\n+from persistent.mapping import PersistentMapping\n from zope.annotation.interfaces import IAnnotations\n from zope.component import adapter\n from zope.component import getUtility\n@@ -169,7 +169,7 @@ def _locks(self, create=True):\n         annotations = IAnnotations(self.context)\n         locks = annotations.get(ANNOTATION_KEY, None)\n         if locks is None and create:\n-            locks = annotations.setdefault(ANNOTATION_KEY, PersistentDict())\n+            locks = annotations.setdefault(ANNOTATION_KEY, PersistentMapping())\n \n         try:\n             safeWrite(annotations.obj.__annotations__)\n'
+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'
 
-Repository: plone.locking
+Repository: plone.portlets
 
 
 Branch: refs/heads/master
-Date: 2025-01-21T17:57:38-08:00
+Date: 2025-01-21T18:00:54-08:00
 Author: David Glick (davisagli) <david@glicksoftware.com>
-Commit: https://github.com/plone/plone.locking/commit/b30ad2b414a74657d83e85be012a5b0782a4baaa
+Commit: https://github.com/plone/plone.portlets/commit/886c2858e4b3a7470fec1483da356b6b43f42b72
 
-Merge pull request #43 from plone/maurits-warnings
+Merge pull request #28 from plone/maurits-warnings
 
 Fix DeprecationWarnings.
 
 Files changed:
 A news/4090.bugfix
-M plone/locking/lockable.py
+M plone/portlets/assignable.py
+M plone/portlets/settings.py
+M plone/portlets/storage.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/locking/lockable.py b/plone/locking/lockable.py\nindex e68b01d..b5c61f8 100644\n--- a/plone/locking/lockable.py\n+++ b/plone/locking/lockable.py\n@@ -1,5 +1,5 @@\n from AccessControl import getSecurityManager\n-from persistent.dict import PersistentDict\n+from persistent.mapping import PersistentMapping\n from zope.annotation.interfaces import IAnnotations\n from zope.component import adapter\n from zope.component import getUtility\n@@ -169,7 +169,7 @@ def _locks(self, create=True):\n         annotations = IAnnotations(self.context)\n         locks = annotations.get(ANNOTATION_KEY, None)\n         if locks is None and create:\n-            locks = annotations.setdefault(ANNOTATION_KEY, PersistentDict())\n+            locks = annotations.setdefault(ANNOTATION_KEY, PersistentMapping())\n \n         try:\n             safeWrite(annotations.obj.__annotations__)\n'
+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'