Merge pull request #366 from plone/maurits-warnings

Fix DeprecationWarnings.
plone · Jan 22, 2025 · 6d90bb5 · 6d90bb5
2 parents 623b0c6 + d83442e
commit 6d90bb5
Show file tree

Hide file tree

Showing 51 changed files with 136 additions and 132 deletions.
diff --git a/news/4090.bugfix b/news/4090.bugfix
@@ -0,0 +1 @@
+Fix DeprecationWarnings. [maurits]
diff --git a/setup.py b/setup.py
@@ -50,11 +50,14 @@
         "setuptools",
         "plone.base",
         "plone.resource",
+        "zope.i18nmessageid",
+        "zope.interface",
     ],
     extras_require={
         "test": [
             "plone.app.testing",
             "plone.registry",
+            "zope.component",
         ],
     },
     entry_points="""

diff --git a/src/plone/staticresources/profiles/async/registry/bundles.xml b/src/plone/staticresources/profiles/async/registry/bundles.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <registry>
 
-  <records interface="Products.CMFPlone.interfaces.IBundleRegistry"
+  <records interface="plone.base.interfaces.IBundleRegistry"
            prefix="plone.bundles/plone"
   >
     <value key="load_async">True</value>

diff --git a/src/plone/staticresources/profiles/uninstall/registry/bundles.xml b/src/plone/staticresources/profiles/uninstall/registry/bundles.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <registry>
-  <records interface="Products.CMFPlone.interfaces.IBundleRegistry"
+  <records interface="plone.base.interfaces.IBundleRegistry"
            prefix="plone.bundles/plone"
            remove="True"
   />
-  <records interface="Products.CMFPlone.interfaces.IBundleRegistry"
+  <records interface="plone.base.interfaces.IBundleRegistry"
            prefix="plone.bundles/plone-fullscreen"
            remove="True"
   />

diff --git a/src/plone/staticresources/upgrades/10.zcml b/src/plone/staticresources/upgrades/10.zcml
@@ -8,7 +8,7 @@
       title="Update bundles"
       description="Configuration for version 10"
       provides="Products.GenericSetup.interfaces.EXTENSION"
-      for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot"
+      for="plone.base.interfaces.IMigratingPloneSiteRoot"
       directory="profiles/10"
       />
 

diff --git a/src/plone/staticresources/upgrades/11.zcml b/src/plone/staticresources/upgrades/11.zcml
@@ -8,7 +8,7 @@
       title="Update bundles"
       description="Configuration for version 11"
       provides="Products.GenericSetup.interfaces.EXTENSION"
-      for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot"
+      for="plone.base.interfaces.IMigratingPloneSiteRoot"
       directory="profiles/11"
       />
 

diff --git a/src/plone/staticresources/upgrades/2.zcml b/src/plone/staticresources/upgrades/2.zcml
@@ -8,7 +8,7 @@
       title="Update Bundles"
       description="Configuration for version 2"
       provides="Products.GenericSetup.interfaces.EXTENSION"
-      for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot"
+      for="plone.base.interfaces.IMigratingPloneSiteRoot"
       directory="profiles/2"
       />
 

diff --git a/src/plone/staticresources/upgrades/200.zcml b/src/plone/staticresources/upgrades/200.zcml
@@ -8,7 +8,7 @@
       title="Update bundles"
       description="Configuration for version 200"
       provides="Products.GenericSetup.interfaces.EXTENSION"
-      for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot"
+      for="plone.base.interfaces.IMigratingPloneSiteRoot"
       directory="profiles/200"
       />
 

diff --git a/src/plone/staticresources/upgrades/201.zcml b/src/plone/staticresources/upgrades/201.zcml
@@ -8,7 +8,7 @@
       title="Update bundles"
       description="Configuration for version 201"
       provides="Products.GenericSetup.interfaces.EXTENSION"
-      for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot"
+      for="plone.base.interfaces.IMigratingPloneSiteRoot"
       directory="profiles/201"
       />
 

diff --git a/src/plone/staticresources/upgrades/202.zcml b/src/plone/staticresources/upgrades/202.zcml
@@ -8,7 +8,7 @@
       title="Update bundles"
       description="Configuration for version 202"
       provides="Products.GenericSetup.interfaces.EXTENSION"
-      for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot"
+      for="plone.base.interfaces.IMigratingPloneSiteRoot"
       directory="profiles/202"
       />
 

diff --git a/src/plone/staticresources/upgrades/203.zcml b/src/plone/staticresources/upgrades/203.zcml
@@ -8,7 +8,7 @@
       title="Update bundles"
       description="Configuration for version 203"
       provides="Products.GenericSetup.interfaces.EXTENSION"
-      for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot"
+      for="plone.base.interfaces.IMigratingPloneSiteRoot"
       directory="profiles/203"
       />
 

diff --git a/src/plone/staticresources/upgrades/204.zcml b/src/plone/staticresources/upgrades/204.zcml
@@ -8,7 +8,7 @@
       title="Update bundles"
       description="Configuration for version 204"
       provides="Products.GenericSetup.interfaces.EXTENSION"
-      for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot"
+      for="plone.base.interfaces.IMigratingPloneSiteRoot"
       directory="profiles/204"
       />
 

diff --git a/src/plone/staticresources/upgrades/205.zcml b/src/plone/staticresources/upgrades/205.zcml
@@ -8,7 +8,7 @@
       title="Update bundles"
       description="Configuration for version 205"
       provides="Products.GenericSetup.interfaces.EXTENSION"
-      for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot"
+      for="plone.base.interfaces.IMigratingPloneSiteRoot"
       directory="profiles/205"
       />
 

diff --git a/src/plone/staticresources/upgrades/206.zcml b/src/plone/staticresources/upgrades/206.zcml
@@ -8,7 +8,7 @@
       title="Update bundles"
       description="Configuration for version 206"
       provides="Products.GenericSetup.interfaces.EXTENSION"
-      for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot"
+      for="plone.base.interfaces.IMigratingPloneSiteRoot"
       directory="profiles/206"
       />
 

diff --git a/src/plone/staticresources/upgrades/207.zcml b/src/plone/staticresources/upgrades/207.zcml
@@ -8,7 +8,7 @@
       title="Update svg toolbar icons"
       description="Configuration for version 207"
       provides="Products.GenericSetup.interfaces.EXTENSION"
-      for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot"
+      for="plone.base.interfaces.IMigratingPloneSiteRoot"
       directory="profiles/207"
       />
 

diff --git a/src/plone/staticresources/upgrades/208.zcml b/src/plone/staticresources/upgrades/208.zcml
@@ -8,7 +8,7 @@
       title="Update svg toolbar icons"
       description="Configuration for version 208"
       provides="Products.GenericSetup.interfaces.EXTENSION"
-      for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot"
+      for="plone.base.interfaces.IMigratingPloneSiteRoot"
       directory="profiles/208"
       />
 

diff --git a/src/plone/staticresources/upgrades/209.zcml b/src/plone/staticresources/upgrades/209.zcml
@@ -8,7 +8,7 @@
       title="Update svg bootstrap icons"
       description="Configuration for version 209"
       provides="Products.GenericSetup.interfaces.EXTENSION"
-      for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot"
+      for="plone.base.interfaces.IMigratingPloneSiteRoot"
       directory="profiles/209"
       />
 

diff --git a/src/plone/staticresources/upgrades/210.zcml b/src/plone/staticresources/upgrades/210.zcml
@@ -8,7 +8,7 @@
       title="Update to Mockup with module federation."
       description="Configuration for version 210"
       provides="Products.GenericSetup.interfaces.EXTENSION"
-      for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot"
+      for="plone.base.interfaces.IMigratingPloneSiteRoot"
       directory="profiles/210"
       />
 

diff --git a/src/plone/staticresources/upgrades/211.zcml b/src/plone/staticresources/upgrades/211.zcml
@@ -8,7 +8,7 @@
       title="Add image fullscreen support"
       description="Configuration for version 211"
       provides="Products.GenericSetup.interfaces.EXTENSION"
-      for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot"
+      for="plone.base.interfaces.IMigratingPloneSiteRoot"
       directory="profiles/211"
       />
 

diff --git a/src/plone/staticresources/upgrades/212.zcml b/src/plone/staticresources/upgrades/212.zcml
@@ -8,7 +8,7 @@
       title="Remove obsolete jquery and bootstrap-js bundles"
       description="Configuration for version 212"
       provides="Products.GenericSetup.interfaces.EXTENSION"
-      for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot"
+      for="plone.base.interfaces.IMigratingPloneSiteRoot"
       directory="profiles/212"
       />
 

diff --git a/src/plone/staticresources/upgrades/213.zcml b/src/plone/staticresources/upgrades/213.zcml
@@ -8,7 +8,7 @@
       title="Update svg bootstrap icons"
       description="Configuration for version 213"
       provides="Products.GenericSetup.interfaces.EXTENSION"
-      for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot"
+      for="plone.base.interfaces.IMigratingPloneSiteRoot"
       directory="profiles/213"
       />
 

diff --git a/src/plone/staticresources/upgrades/214.zcml b/src/plone/staticresources/upgrades/214.zcml
@@ -8,7 +8,7 @@
       title="Update svg bootstrap icons"
       description="Configuration for version 214"
       provides="Products.GenericSetup.interfaces.EXTENSION"
-      for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot"
+      for="plone.base.interfaces.IMigratingPloneSiteRoot"
       directory="profiles/214"
       />
 

diff --git a/src/plone/staticresources/upgrades/215.zcml b/src/plone/staticresources/upgrades/215.zcml
@@ -8,7 +8,7 @@
       title="Update svg bootstrap icons"
       description="Configuration for version 214 (Bootstrap icons 1.11.1)"
       provides="Products.GenericSetup.interfaces.EXTENSION"
-      for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot"
+      for="plone.base.interfaces.IMigratingPloneSiteRoot"
       directory="profiles/215"
       />
 

diff --git a/src/plone/staticresources/upgrades/3.zcml b/src/plone/staticresources/upgrades/3.zcml
@@ -8,7 +8,7 @@
       title="Update bundles (split bundles)"
       description="Configuration for version 3"
       provides="Products.GenericSetup.interfaces.EXTENSION"
-      for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot"
+      for="plone.base.interfaces.IMigratingPloneSiteRoot"
       directory="profiles/3"
       />
 

diff --git a/src/plone/staticresources/upgrades/4.zcml b/src/plone/staticresources/upgrades/4.zcml
@@ -8,7 +8,7 @@
       title="Change r.js and less.js paths for TTW compilation"
       description="Configuration for version 4"
       provides="Products.GenericSetup.interfaces.EXTENSION"
-      for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot"
+      for="plone.base.interfaces.IMigratingPloneSiteRoot"
       directory="profiles/4"
       />
 

diff --git a/src/plone/staticresources/upgrades/5.zcml b/src/plone/staticresources/upgrades/5.zcml
@@ -8,7 +8,7 @@
       title="Update Bundles"
       description="Configuration for version 5"
       provides="Products.GenericSetup.interfaces.EXTENSION"
-      for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot"
+      for="plone.base.interfaces.IMigratingPloneSiteRoot"
       directory="profiles/5"
       />
 

diff --git a/src/plone/staticresources/upgrades/6.zcml b/src/plone/staticresources/upgrades/6.zcml
@@ -8,7 +8,7 @@
       title="Update Bundles"
       description="Configuration for version 6"
       provides="Products.GenericSetup.interfaces.EXTENSION"
-      for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot"
+      for="plone.base.interfaces.IMigratingPloneSiteRoot"
       directory="profiles/6"
       />
 

diff --git a/src/plone/staticresources/upgrades/7.zcml b/src/plone/staticresources/upgrades/7.zcml
@@ -8,7 +8,7 @@
       title="Update bundles"
       description="Configuration for version 7"
       provides="Products.GenericSetup.interfaces.EXTENSION"
-      for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot"
+      for="plone.base.interfaces.IMigratingPloneSiteRoot"
       directory="profiles/7"
       />
 

diff --git a/src/plone/staticresources/upgrades/8.zcml b/src/plone/staticresources/upgrades/8.zcml
@@ -8,7 +8,7 @@
       title="Update bundles"
       description="Configuration for version 8"
       provides="Products.GenericSetup.interfaces.EXTENSION"
-      for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot"
+      for="plone.base.interfaces.IMigratingPloneSiteRoot"
       directory="profiles/8"
       />
 

diff --git a/src/plone/staticresources/upgrades/9.zcml b/src/plone/staticresources/upgrades/9.zcml
@@ -8,7 +8,7 @@
       title="Update bundles"
       description="Configuration for version 9"
       provides="Products.GenericSetup.interfaces.EXTENSION"
-      for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot"
+      for="plone.base.interfaces.IMigratingPloneSiteRoot"
       directory="profiles/9"
       />
 

diff --git a/src/plone/staticresources/upgrades/profiles/10/registry.xml b/src/plone/staticresources/upgrades/profiles/10/registry.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <registry>
-  <records interface="Products.CMFPlone.interfaces.IBundleRegistry"
+  <records interface="plone.base.interfaces.IBundleRegistry"
            prefix="plone.bundles/plone-logged-in"
   >
     <value key="last_compilation">2020-08-03 18:00:00</value>

diff --git a/src/plone/staticresources/upgrades/profiles/11/registry.xml b/src/plone/staticresources/upgrades/profiles/11/registry.xml
@@ -1,56 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
 <registry>
-  <records interface="Products.CMFPlone.interfaces.IBundleRegistry"
+  <records interface="plone.base.interfaces.IBundleRegistry"
            prefix="plone.bundles/plone-base"
   >
     <value key="last_compilation">2020-10-28 14:00:00</value>
   </records>
-  <records interface="Products.CMFPlone.interfaces.IBundleRegistry"
+  <records interface="plone.base.interfaces.IBundleRegistry"
            prefix="plone.bundles/plone"
   >
     <value key="last_compilation">2020-10-28 14:00:00</value>
   </records>
-  <records interface="Products.CMFPlone.interfaces.IBundleRegistry"
+  <records interface="plone.base.interfaces.IBundleRegistry"
            prefix="plone.bundles/plone-moment"
   >
     <value key="last_compilation">2020-10-28 14:00:00</value>
   </records>
-  <records interface="Products.CMFPlone.interfaces.IBundleRegistry"
+  <records interface="plone.base.interfaces.IBundleRegistry"
            prefix="plone.bundles/plone-logged-in"
   >
     <value key="last_compilation">2020-10-28 14:00:00</value>
   </records>
-  <records interface="Products.CMFPlone.interfaces.IBundleRegistry"
+  <records interface="plone.base.interfaces.IBundleRegistry"
            prefix="plone.bundles/plone-editor-tools"
   >
     <value key="last_compilation">2020-10-28 14:00:00</value>
   </records>
-  <records interface="Products.CMFPlone.interfaces.IBundleRegistry"
+  <records interface="plone.base.interfaces.IBundleRegistry"
            prefix="plone.bundles/plone-tinymce"
   >
     <value key="last_compilation">2020-10-28 14:00:00</value>
   </records>
-  <records interface="Products.CMFPlone.interfaces.IBundleRegistry"
+  <records interface="plone.base.interfaces.IBundleRegistry"
            prefix="plone.bundles/plone-datatables"
   >
     <value key="last_compilation">2020-10-28 14:00:00</value>
   </records>
-  <records interface="Products.CMFPlone.interfaces.IBundleRegistry"
+  <records interface="plone.base.interfaces.IBundleRegistry"
            prefix="plone.bundles/resourceregistryt"
   >
     <value key="last_compilation">2020-10-28 14:00:00</value>
   </records>
-  <records interface="Products.CMFPlone.interfaces.IBundleRegistry"
+  <records interface="plone.base.interfaces.IBundleRegistry"
            prefix="plone.bundles/thememapper"
   >
     <value key="last_compilation">2020-10-28 14:00:00</value>
   </records>
-  <records interface="Products.CMFPlone.interfaces.IBundleRegistry"
+  <records interface="plone.base.interfaces.IBundleRegistry"
            prefix="plone.bundles/filemanager"
   >
     <value key="last_compilation">2020-10-28 14:00:00</value>
   </records>
-  <records interface="Products.CMFPlone.interfaces.IBundleRegistry"
+  <records interface="plone.base.interfaces.IBundleRegistry"
            prefix="plone.bundles/plone-moment"
   >
     <value key="last_compilation">2020-10-28 14:00:00</value>

diff --git a/src/plone/staticresources/upgrades/profiles/2/registry.xml b/src/plone/staticresources/upgrades/profiles/2/registry.xml
@@ -6,42 +6,42 @@
     </field>
     <value>++plone++static/components/requirejs/bin/r.js</value>
   </record>
-  <records interface="Products.CMFPlone.interfaces.IResourceRegistry"
+  <records interface="plone.base.interfaces.IResourceRegistry"
            prefix="plone.resources/jquery.form"
   >
     <value key="js">++plone++static/components/jquery-form/src/jquery.form.js</value>
   </records>
-  <records interface="Products.CMFPlone.interfaces.IBundleRegistry"
+  <records interface="plone.base.interfaces.IBundleRegistry"
            prefix="plone.bundles/filemanager"
   >
     <value key="last_compilation">2019-10-27 10:00:00</value>
   </records>
-  <records interface="Products.CMFPlone.interfaces.IBundleRegistry"
+  <records interface="plone.base.interfaces.IBundleRegistry"
            prefix="plone.bundles/plone"
   >
     <value key="last_compilation">2019-10-27 10:00:00</value>
   </records>
-  <records interface="Products.CMFPlone.interfaces.IBundleRegistry"
+  <records interface="plone.base.interfaces.IBundleRegistry"
            prefix="plone.bundles/plone-base"
   >
     <value key="last_compilation">2019-10-27 10:00:00</value>
   </records>
-  <records interface="Products.CMFPlone.interfaces.IBundleRegistry"
+  <records interface="plone.base.interfaces.IBundleRegistry"
            prefix="plone.bundles/plone-legacy"
   >
     <value key="last_compilation">2019-10-27 10:00:00</value>
   </records>
-  <records interface="Products.CMFPlone.interfaces.IBundleRegistry"
+  <records interface="plone.base.interfaces.IBundleRegistry"
            prefix="plone.bundles/plone-logged-in"
   >
     <value key="last_compilation">2019-10-27 10:00:00</value>
   </records>
-  <records interface="Products.CMFPlone.interfaces.IBundleRegistry"
+  <records interface="plone.base.interfaces.IBundleRegistry"
            prefix="plone.bundles/resourceregistry"
   >
     <value key="last_compilation">2019-10-27 10:00:00</value>
   </records>
-  <records interface="Products.CMFPlone.interfaces.IBundleRegistry"
+  <records interface="plone.base.interfaces.IBundleRegistry"
            prefix="plone.bundles/thememapper"
   >
     <value key="last_compilation">2019-10-27 10:00:00</value>