run plone-codemod

1letter · 1letter · commit 1cf8ff9f9fe2 · 2026-04-20T14:23:40.000+02:00
diff --git a/src/collective/easyform/browser/configure.zcml b/src/collective/easyform/browser/configure.zcml
@@ -26,7 +26,7 @@
       />
   <browser:page
       name="easyform-controlpanel"
-      for="Products.CMFPlone.interfaces.IPloneSiteRoot"
+      for="plone.base.interfaces.siteroot.IPloneSiteRoot"
       class=".controlpanel.EasyFormControlPanelView"
       permission="cmf.ManagePortal"
       layer="..interfaces.IEasyFormLayer"
diff --git a/src/collective/easyform/browser/easyform_layout.pt b/src/collective/easyform/browser/easyform_layout.pt
@@ -3,7 +3,7 @@
       xmlns:metal="http://xml.zope.org/namespaces/metal"
       xmlns:tal="http://xml.zope.org/namespaces/tal"
       lang="en"
-      metal:use-macro="here/main_template/macros/master"
+      metal:use-macro="context/@@main_template/macros/master"
       xml:lang="en"
       i18n:domain="plone"
 >
diff --git a/src/collective/easyform/browser/model_listing.pt b/src/collective/easyform/browser/model_listing.pt
@@ -1,4 +1,4 @@
-<html metal:use-macro="context/main_template/macros/master"
+<html metal:use-macro="context/@@main_template/macros/master"
       i18n:domain="collective.easyform"
 >
   <body>
diff --git a/src/collective/easyform/browser/modeleditor.pt b/src/collective/easyform/browser/modeleditor.pt
@@ -3,7 +3,7 @@
       xmlns:metal="http://xml.zope.org/namespaces/metal"
       xmlns:tal="http://xml.zope.org/namespaces/tal"
       lang="en"
-      metal:use-macro="context/main_template/macros/master"
+      metal:use-macro="context/@@main_template/macros/master"
       xml:lang="en"
       i18n:domain="plone"
 >
diff --git a/src/collective/easyform/browser/saveddata.pt b/src/collective/easyform/browser/saveddata.pt
@@ -1,4 +1,4 @@
-<html metal:use-macro="context/main_template/macros/master"
+<html metal:use-macro="context/@@main_template/macros/master"
       i18n:domain="collective.easyform"
 >
   <body>
diff --git a/src/collective/easyform/configure.zcml b/src/collective/easyform/configure.zcml
@@ -49,7 +49,7 @@
       title="EasyForm testing"
       description="Used for testing only"
       provides="Products.GenericSetup.interfaces.EXTENSION"
-      for="Products.CMFPlone.interfaces.IPloneSiteRoot"
+      for="plone.base.interfaces.siteroot.IPloneSiteRoot"
       directory="profiles/testing"
       />
 
diff --git a/src/collective/easyform/profiles/default/registry.xml b/src/collective/easyform/profiles/default/registry.xml
@@ -55,7 +55,7 @@
     </value>
   </record>
 
-  <records interface="Products.CMFPlone.interfaces.IBundleRegistry"
+  <records interface="plone.base.interfaces.resources.IBundleRegistry"
            prefix="plone.bundles/easyform"
   >
     <value key="enabled">True</value>
diff --git a/src/collective/easyform/setuphandlers.py b/src/collective/easyform/setuphandlers.py
@@ -1,4 +1,4 @@
-from Products.CMFPlone.interfaces import INonInstallable
+from plone.base.interfaces.installable import INonInstallable
 from zope.interface import implementer
 
 
diff --git a/src/collective/easyform/tests/fixtures/wrapper_template.pt b/src/collective/easyform/tests/fixtures/wrapper_template.pt
@@ -3,7 +3,7 @@
       xmlns:metal="http://xml.zope.org/namespaces/metal"
       xmlns:tal="http://xml.zope.org/namespaces/tal"
       lang="en"
-      metal:use-macro="here/main_template/macros/master"
+      metal:use-macro="context/@@main_template/macros/master"
       i18n:domain="plone"
 >
 
diff --git a/src/collective/easyform/upgrades/1016.zcml b/src/collective/easyform/upgrades/1016.zcml
@@ -7,7 +7,7 @@
       name="1016"
       title="EasyForm upgrade"
       provides="Products.GenericSetup.interfaces.EXTENSION"
-      for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot"
+      for="plone.base.interfaces.siteroot.IMigratingPloneSiteRoot"
       directory="profiles/1016"
       />
 
diff --git a/src/collective/easyform/upgrades/1017.zcml b/src/collective/easyform/upgrades/1017.zcml
@@ -7,7 +7,7 @@
       name="1017"
       title="EasyForm upgrade"
       provides="Products.GenericSetup.interfaces.EXTENSION"
-      for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot"
+      for="plone.base.interfaces.siteroot.IMigratingPloneSiteRoot"
       directory="profiles/1017"
       />
 
diff --git a/src/collective/easyform/upgrades/__init__.py b/src/collective/easyform/upgrades/__init__.py
@@ -20,8 +20,8 @@ def update_last_compilation(context, timetuple=None):
     # Let's do the imports inline, so they are not needlessly done at startup.
     # Should not really matter, but oh well.
     from datetime import datetime
+    from plone.base.interfaces.resources import IBundleRegistry
     from plone.registry.interfaces import IRegistry
-    from Products.CMFPlone.interfaces import IBundleRegistry
     from zope.component import getUtility
 
     registry = getUtility(IRegistry)

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`xmlns:metal="http://xml.zope.org/namespaces/metal"`
`4`	`4`	`xmlns:tal="http://xml.zope.org/namespaces/tal"`
`5`	`5`	`lang="en"`
`6`		`- metal:use-macro="here/main_template/macros/master"`
	`6`	`+ metal:use-macro="context/@@main_template/macros/master"`
`7`	`7`	`xml:lang="en"`
`8`	`8`	`i18n:domain="plone"`
`9`	`9`	`>`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<html metal:use-macro="context/main_template/macros/master"`
	`1`	`+<html metal:use-macro="context/@@main_template/macros/master"`
`2`	`2`	`i18n:domain="collective.easyform"`
`3`	`3`	`>`
`4`	`4`	`<body>`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@`
`55`	`55`	`</value>`
`56`	`56`	`</record>`
`57`	`57`
`58`		`- <records interface="Products.CMFPlone.interfaces.IBundleRegistry"`
	`58`	`+ <records interface="plone.base.interfaces.resources.IBundleRegistry"`
`59`	`59`	`prefix="plone.bundles/easyform"`
`60`	`60`	`>`
`61`	`61`	`<value key="enabled">True</value>`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from Products.CMFPlone.interfaces import INonInstallable`
	`1`	`+from plone.base.interfaces.installable import INonInstallable`
`2`	`2`	`from zope.interface import implementer`
`3`	`3`
`4`	`4`