[fc] Repository: plone.formwidget.namedfile

Branch: refs/heads/master Date: 2025-01-20T21:24:16+01:00 Author: Maurits van Rees (mauritsvanrees) <[email protected]> Commit: plone/plone.formwidget.namedfile@56e1fb3 Fix DeprecationWarnings. Files changed: A news/4090.bugfix M plone/formwidget/namedfile/widget.py Repository: plone.formwidget.namedfile Branch: refs/heads/master Date: 2025-01-21T17:57:12-08:00 Author: David Glick (davisagli) <[email protected]> Commit: plone/plone.formwidget.namedfile@213a704 Merge pull request #77 from plone/maurits-warnings Fix DeprecationWarnings. Files changed: A news/4090.bugfix M plone/formwidget/namedfile/widget.py
plone · Jan 22, 2025 · 9cf984f · 9cf984f
1 parent 5bb02cd
commit 9cf984f
Showing 1 changed file with 12 additions and 14 deletions.
diff --git a/last_commit.txt b/last_commit.txt
@@ -1,36 +1,34 @@
-Repository: plone.app.viewletmanager
+Repository: plone.formwidget.namedfile
 
 
 Branch: refs/heads/master
-Date: 2025-01-20T21:12:44+01:00
+Date: 2025-01-20T21:24:16+01:00
 Author: Maurits van Rees (mauritsvanrees) <[email protected]>
-Commit: https://github.com/plone/plone.app.viewletmanager/commit/551d08da0ae5da2788564b886c97d6724800f843
+Commit: https://github.com/plone/plone.formwidget.namedfile/commit/56e1fb3b5c972888b462260a3dbc571e22fc686d
 
 Fix DeprecationWarnings.
 
 Files changed:
 A news/4090.bugfix
-M plone/app/viewletmanager/storage.py
-M plone/app/viewletmanager/tests/test_exportimport.py
+M plone/formwidget/namedfile/widget.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/app/viewletmanager/storage.py b/plone/app/viewletmanager/storage.py\nindex ce6c22d..6149e34 100644\n--- a/plone/app/viewletmanager/storage.py\n+++ b/plone/app/viewletmanager/storage.py\n@@ -1,5 +1,5 @@\n from persistent import Persistent\n-from persistent.dict import PersistentDict\n+from persistent.mapping import PersistentMapping\n from plone.app.viewletmanager.interfaces import IViewletSettingsStorage\n from zope.interface import implementer\n \n@@ -7,9 +7,9 @@\n @implementer(IViewletSettingsStorage)\n class ViewletSettingsStorage(Persistent):\n     def __init__(self):\n-        self._order = PersistentDict()\n-        self._hidden = PersistentDict()\n-        self._defaults = PersistentDict()\n+        self._order = PersistentMapping()\n+        self._hidden = PersistentMapping()\n+        self._defaults = PersistentMapping()\n \n     def getOrder(self, name, skinname):\n         skin = self._order.get(skinname, {})\n@@ -22,7 +22,7 @@ def getOrder(self, name, skinname):\n         return order\n \n     def setOrder(self, name, skinname, order):\n-        skin = self._order.setdefault(skinname, PersistentDict())\n+        skin = self._order.setdefault(skinname, PersistentMapping())\n         skin[name] = tuple(order)\n         if self.getDefault(name) is None:\n             self.setDefault(name, skinname)\n@@ -38,14 +38,14 @@ def getHidden(self, name, skinname):\n         return hidden\n \n     def setHidden(self, name, skinname, hidden):\n-        skin = self._hidden.setdefault(skinname, PersistentDict())\n+        skin = self._hidden.setdefault(skinname, PersistentMapping())\n         skin[name] = tuple(hidden)\n \n     def getDefault(self, name):\n         try:\n             return self._defaults.get(name)\n         except AttributeError:  # Backward compatibility\n-            self._defaults = PersistentDict()\n+            self._defaults = PersistentMapping()\n             self.setDefault(name, "Plone Default")\n             return self.getDefault(name)\n \n@@ -53,5 +53,5 @@ def setDefault(self, name, skinname):\n         try:\n             self._defaults[name] = skinname\n         except AttributeError:  # Backward compatibility\n-            self._defaults = PersistentDict()\n+            self._defaults = PersistentMapping()\n             self.setDefault(name, skinname)\ndiff --git a/plone/app/viewletmanager/tests/test_exportimport.py b/plone/app/viewletmanager/tests/test_exportimport.py\nindex ba93dbd..d4bed3f 100644\n--- a/plone/app/viewletmanager/tests/test_exportimport.py\n+++ b/plone/app/viewletmanager/tests/test_exportimport.py\n@@ -1,4 +1,4 @@\n-from persistent.dict import PersistentDict\n+from persistent.mapping import PersistentMapping\n from plone.app.viewletmanager.exportimport.storage import exportViewletSettingsStorage\n from plone.app.viewletmanager.exportimport.storage import importViewletSettingsStorage\n from plone.app.viewletmanager.exportimport.storage import (\n@@ -159,13 +159,13 @@ def _populate(self, obj):\n     def _verifyImport(self, obj):\n         fancydict = {"top": ("two", "three", "one")}\n         hiddendict = {"top": ("two",)}\n-        self.assertEqual(type(obj._order), PersistentDict)\n+        self.assertEqual(type(obj._order), PersistentMapping)\n         self.assertTrue("fancy" in obj._order.keys())\n-        self.assertEqual(type(obj._order["fancy"]), PersistentDict)\n+        self.assertEqual(type(obj._order["fancy"]), PersistentMapping)\n         self.assertEqual(dict(obj._order["fancy"]), fancydict)\n-        self.assertEqual(type(obj._hidden), PersistentDict)\n+        self.assertEqual(type(obj._hidden), PersistentMapping)\n         self.assertTrue("light" in obj._hidden.keys())\n-        self.assertEqual(type(obj._hidden["light"]), PersistentDict)\n+        self.assertEqual(type(obj._hidden["light"]), PersistentMapping)\n         self.assertEqual(dict(obj._hidden["light"]), hiddendict)\n \n \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/formwidget/namedfile/widget.py b/plone/formwidget/namedfile/widget.py\nindex a752fcf..3bb1c3d 100644\n--- a/plone/formwidget/namedfile/widget.py\n+++ b/plone/formwidget/namedfile/widget.py\n@@ -2,7 +2,7 @@\n from Acquisition import Explicit\n from datetime import datetime\n from os import SEEK_END\n-from persistent.dict import PersistentDict\n+from persistent.mapping import PersistentMapping\n from plone.formwidget.namedfile import utils\n from plone.formwidget.namedfile.converter import b64decode_file\n from plone.formwidget.namedfile.interfaces import IFileUploadTemporaryStorage\n@@ -58,7 +58,7 @@ def _make_namedfile(value, field, widget):\n     string_types = (bytes, str)\n     if isinstance(value, string_types) and IBytes.providedBy(field):\n         filename, data = b64decode_file(value)\n-    elif isinstance(value, dict) or isinstance(value, PersistentDict):\n+    elif isinstance(value, dict) or isinstance(value, PersistentMapping):\n         filename = value["filename"]\n         data = value["data"]\n \n@@ -130,7 +130,7 @@ def file_upload_id(self):\n             upload_id = uuid.uuid4().hex\n             up = IFileUploadTemporaryStorage(getSite())\n             up.cleanup()\n-            up.upload_map[upload_id] = PersistentDict(\n+            up.upload_map[upload_id] = PersistentMapping(\n                 filename=self.value.filename,\n                 data=data,\n                 dt=datetime.now(),\n'
 
-Repository: plone.app.viewletmanager
+Repository: plone.formwidget.namedfile
 
 
 Branch: refs/heads/master
-Date: 2025-01-21T17:56:44-08:00
-Author: David Glick (davisagli) <david[email protected]>
-Commit: https://github.com/plone/plone.app.viewletmanager/commit/99cccfb7be6d31b9fda82ea06106412ac8ab96f0
+Date: 2025-01-21T17:57:12-08:00
+Author: David Glick (davisagli) <david@glicksoftware.com>
+Commit: https://github.com/plone/plone.formwidget.namedfile/commit/213a7046ad4d2e23d54c966603e0a91ddb9482b6
 
-Merge pull request #56 from plone/maurits-warnings
+Merge pull request #77 from plone/maurits-warnings
 
 Fix DeprecationWarnings.
 
 Files changed:
 A news/4090.bugfix
-M plone/app/viewletmanager/storage.py
-M plone/app/viewletmanager/tests/test_exportimport.py
+M plone/formwidget/namedfile/widget.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/app/viewletmanager/storage.py b/plone/app/viewletmanager/storage.py\nindex ce6c22d..6149e34 100644\n--- a/plone/app/viewletmanager/storage.py\n+++ b/plone/app/viewletmanager/storage.py\n@@ -1,5 +1,5 @@\n from persistent import Persistent\n-from persistent.dict import PersistentDict\n+from persistent.mapping import PersistentMapping\n from plone.app.viewletmanager.interfaces import IViewletSettingsStorage\n from zope.interface import implementer\n \n@@ -7,9 +7,9 @@\n @implementer(IViewletSettingsStorage)\n class ViewletSettingsStorage(Persistent):\n     def __init__(self):\n-        self._order = PersistentDict()\n-        self._hidden = PersistentDict()\n-        self._defaults = PersistentDict()\n+        self._order = PersistentMapping()\n+        self._hidden = PersistentMapping()\n+        self._defaults = PersistentMapping()\n \n     def getOrder(self, name, skinname):\n         skin = self._order.get(skinname, {})\n@@ -22,7 +22,7 @@ def getOrder(self, name, skinname):\n         return order\n \n     def setOrder(self, name, skinname, order):\n-        skin = self._order.setdefault(skinname, PersistentDict())\n+        skin = self._order.setdefault(skinname, PersistentMapping())\n         skin[name] = tuple(order)\n         if self.getDefault(name) is None:\n             self.setDefault(name, skinname)\n@@ -38,14 +38,14 @@ def getHidden(self, name, skinname):\n         return hidden\n \n     def setHidden(self, name, skinname, hidden):\n-        skin = self._hidden.setdefault(skinname, PersistentDict())\n+        skin = self._hidden.setdefault(skinname, PersistentMapping())\n         skin[name] = tuple(hidden)\n \n     def getDefault(self, name):\n         try:\n             return self._defaults.get(name)\n         except AttributeError:  # Backward compatibility\n-            self._defaults = PersistentDict()\n+            self._defaults = PersistentMapping()\n             self.setDefault(name, "Plone Default")\n             return self.getDefault(name)\n \n@@ -53,5 +53,5 @@ def setDefault(self, name, skinname):\n         try:\n             self._defaults[name] = skinname\n         except AttributeError:  # Backward compatibility\n-            self._defaults = PersistentDict()\n+            self._defaults = PersistentMapping()\n             self.setDefault(name, skinname)\ndiff --git a/plone/app/viewletmanager/tests/test_exportimport.py b/plone/app/viewletmanager/tests/test_exportimport.py\nindex ba93dbd..d4bed3f 100644\n--- a/plone/app/viewletmanager/tests/test_exportimport.py\n+++ b/plone/app/viewletmanager/tests/test_exportimport.py\n@@ -1,4 +1,4 @@\n-from persistent.dict import PersistentDict\n+from persistent.mapping import PersistentMapping\n from plone.app.viewletmanager.exportimport.storage import exportViewletSettingsStorage\n from plone.app.viewletmanager.exportimport.storage import importViewletSettingsStorage\n from plone.app.viewletmanager.exportimport.storage import (\n@@ -159,13 +159,13 @@ def _populate(self, obj):\n     def _verifyImport(self, obj):\n         fancydict = {"top": ("two", "three", "one")}\n         hiddendict = {"top": ("two",)}\n-        self.assertEqual(type(obj._order), PersistentDict)\n+        self.assertEqual(type(obj._order), PersistentMapping)\n         self.assertTrue("fancy" in obj._order.keys())\n-        self.assertEqual(type(obj._order["fancy"]), PersistentDict)\n+        self.assertEqual(type(obj._order["fancy"]), PersistentMapping)\n         self.assertEqual(dict(obj._order["fancy"]), fancydict)\n-        self.assertEqual(type(obj._hidden), PersistentDict)\n+        self.assertEqual(type(obj._hidden), PersistentMapping)\n         self.assertTrue("light" in obj._hidden.keys())\n-        self.assertEqual(type(obj._hidden["light"]), PersistentDict)\n+        self.assertEqual(type(obj._hidden["light"]), PersistentMapping)\n         self.assertEqual(dict(obj._hidden["light"]), hiddendict)\n \n \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/formwidget/namedfile/widget.py b/plone/formwidget/namedfile/widget.py\nindex a752fcf..3bb1c3d 100644\n--- a/plone/formwidget/namedfile/widget.py\n+++ b/plone/formwidget/namedfile/widget.py\n@@ -2,7 +2,7 @@\n from Acquisition import Explicit\n from datetime import datetime\n from os import SEEK_END\n-from persistent.dict import PersistentDict\n+from persistent.mapping import PersistentMapping\n from plone.formwidget.namedfile import utils\n from plone.formwidget.namedfile.converter import b64decode_file\n from plone.formwidget.namedfile.interfaces import IFileUploadTemporaryStorage\n@@ -58,7 +58,7 @@ def _make_namedfile(value, field, widget):\n     string_types = (bytes, str)\n     if isinstance(value, string_types) and IBytes.providedBy(field):\n         filename, data = b64decode_file(value)\n-    elif isinstance(value, dict) or isinstance(value, PersistentDict):\n+    elif isinstance(value, dict) or isinstance(value, PersistentMapping):\n         filename = value["filename"]\n         data = value["data"]\n \n@@ -130,7 +130,7 @@ def file_upload_id(self):\n             upload_id = uuid.uuid4().hex\n             up = IFileUploadTemporaryStorage(getSite())\n             up.cleanup()\n-            up.upload_map[upload_id] = PersistentDict(\n+            up.upload_map[upload_id] = PersistentMapping(\n                 filename=self.value.filename,\n                 data=data,\n                 dt=datetime.now(),\n'