Plone base overhaul

plone/app/contentrules/actions/copy.py

@@ -6,10 +6,10 @@
 from plone.app.contentrules.actions import ActionEditForm
 from plone.app.contentrules.browser.formhelper import ContentRuleFormWrapper
 from plone.app.vocabularies.catalog import CatalogSource
+from plone.base.utils import pretty_title_or_id
 from plone.contentrules.rule.interfaces import IExecutable
 from plone.contentrules.rule.interfaces import IRuleElementData
 from Products.CMFCore.utils import getToolByName
-from Products.CMFPlone import utils
 from Products.statusmessages.interfaces import IStatusMessage
 from ZODB.POSException import ConflictError
 from zope import schema
@@ -112,7 +112,7 @@ def __call__(self):
     def error(self, obj, error):
         request = getattr(self.context, "REQUEST", None)
         if request is not None:
-            title = utils.pretty_title_or_id(obj, obj)
+            title = pretty_title_or_id(obj, obj)
             message = _(
                 "Unable to copy ${name} as part of content rule "
                 "'copy' action: ${error}",

plone/app/contentrules/actions/delete.py

@@ -3,9 +3,9 @@
 from OFS.SimpleItem import SimpleItem
 from plone.app.contentrules import PloneMessageFactory as _
 from plone.app.contentrules.browser.formhelper import NullAddForm
+from plone.base.utils import pretty_title_or_id
 from plone.contentrules.rule.interfaces import IExecutable
 from plone.contentrules.rule.interfaces import IRuleElementData
-from Products.CMFPlone import utils
 from Products.statusmessages.interfaces import IStatusMessage
 from ZODB.POSException import ConflictError
 from zope.component import adapter
@@ -56,7 +56,7 @@ def __call__(self):
     def error(self, obj, error):
         request = getattr(self.context, "REQUEST", None)
         if request is not None:
-            title = utils.pretty_title_or_id(obj, obj)
+            title = pretty_title_or_id(obj, obj)
             message = _(
                 "Unable to remove ${name} as part of content rule 'delete' action: ${error}",  # noqa
                 mapping={"name": title, "error": error},

plone/app/contentrules/actions/mail.py

@@ -4,12 +4,12 @@
 from plone.app.contentrules.actions import ActionAddForm
 from plone.app.contentrules.actions import ActionEditForm
 from plone.app.contentrules.browser.formhelper import ContentRuleFormWrapper
+from plone.base.interfaces.controlpanel import IMailSchema
 from plone.contentrules.rule.interfaces import IExecutable
 from plone.contentrules.rule.interfaces import IRuleElementData
 from plone.registry.interfaces import IRegistry
 from plone.stringinterp.interfaces import IStringInterpolator
 from Products.CMFCore.utils import getToolByName
-from Products.CMFPlone.interfaces.controlpanel import IMailSchema
 from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
 from Products.MailHost.MailHost import MailHostError
 from Products.statusmessages.interfaces import IStatusMessage

plone/app/contentrules/actions/move.py

@@ -9,10 +9,10 @@
 from plone.app.contentrules.actions import ActionEditForm
 from plone.app.contentrules.browser.formhelper import ContentRuleFormWrapper
 from plone.app.vocabularies.catalog import CatalogSource
+from plone.base.utils import pretty_title_or_id
 from plone.contentrules.rule.interfaces import IExecutable
 from plone.contentrules.rule.interfaces import IRuleElementData
 from Products.CMFCore.utils import getToolByName
-from Products.CMFPlone import utils
 from Products.statusmessages.interfaces import IStatusMessage
 from ZODB.POSException import ConflictError
 from zope import schema
@@ -131,7 +131,7 @@ def __call__(self):
     def error(self, obj, error):
         request = getattr(self.context, "REQUEST", None)
         if request is not None:
-            title = utils.pretty_title_or_id(obj, obj)
+            title = pretty_title_or_id(obj, obj)
             message = _(
                 "Unable to move ${name} as part of content rule "
                 "'move' action: ${error}",

plone/app/contentrules/actions/workflow.py

@@ -3,10 +3,11 @@
 from plone.app.contentrules.actions import ActionAddForm
 from plone.app.contentrules.actions import ActionEditForm
 from plone.app.contentrules.browser.formhelper import ContentRuleFormWrapper
+from plone.base.utils import pretty_title_or_id
+from plone.base.utils import safe_text
 from plone.contentrules.rule.interfaces import IExecutable
 from plone.contentrules.rule.interfaces import IRuleElementData
 from Products.CMFCore.utils import getToolByName
-from Products.CMFPlone import utils
 from Products.statusmessages.interfaces import IStatusMessage
 from ZODB.POSException import ConflictError
 from zope import schema
@@ -74,8 +75,8 @@ def __call__(self):
     def error(self, obj, error):
         request = getattr(self.context, "REQUEST", None)
         if request is not None:
-            title = utils.safe_unicode(utils.pretty_title_or_id(obj, obj))
-            error = utils.safe_unicode(error)
+            title = safe_text(pretty_title_or_id(obj, obj))
+            error = safe_text(error)
             message = _(
                 "Unable to change state of ${name} as part of content rule 'workflow' action: ${error}",  # noqa
                 mapping={"name": title, "error": error},

plone/app/contentrules/browser/configure.zcml

@@ -94,39 +94,39 @@
       />
 
     <browser:page
-      for="Products.CMFPlone.interfaces.siteroot.IPloneSiteRoot"
+      for="plone.base.interfaces.siteroot.IPloneSiteRoot"
       name="contentrule-enable"
       class=".controlpanel.ContentRulesControlPanel"
       attribute="enable_rule"
       permission="plone.app.contentrules.ManageContentRules"
     />
 
     <browser:page
-      for="Products.CMFPlone.interfaces.siteroot.IPloneSiteRoot"
+      for="plone.base.interfaces.siteroot.IPloneSiteRoot"
       name="contentrule-disable"
       class=".controlpanel.ContentRulesControlPanel"
       attribute="disable_rule"
       permission="plone.app.contentrules.ManageContentRules"
     />
 
     <browser:page
-      for="Products.CMFPlone.interfaces.siteroot.IPloneSiteRoot"
+      for="plone.base.interfaces.siteroot.IPloneSiteRoot"
       name="contentrule-delete"
       class=".controlpanel.ContentRulesControlPanel"
       attribute="delete_rule"
       permission="plone.app.contentrules.ManageContentRules"
     />
 
     <browser:page
-      for="Products.CMFPlone.interfaces.siteroot.IPloneSiteRoot"
+      for="plone.base.interfaces.siteroot.IPloneSiteRoot"
       name="contentrule-globally-enable"
       class=".controlpanel.ContentRulesControlPanel"
       attribute="globally_enable"
       permission="plone.app.contentrules.ManageContentRules"
     />
 
     <browser:page
-      for="Products.CMFPlone.interfaces.siteroot.IPloneSiteRoot"
+      for="plone.base.interfaces.siteroot.IPloneSiteRoot"
       name="contentrule-globally-disable"
       class=".controlpanel.ContentRulesControlPanel"
       attribute="globally_disable"

plone/app/contentrules/browser/rule.py

@@ -5,8 +5,8 @@
 from plone.app.contentrules.browser.formhelper import ContentRuleFormWrapper
 from plone.app.contentrules.browser.formhelper import EditForm
 from plone.app.contentrules.rule import Rule
+from plone.base.utils import base_hasattr
 from plone.contentrules.rule.interfaces import IRuleConfiguration
-from Products.CMFPlone.utils import base_hasattr
 from z3c.form.form import applyChanges
 from zope.component import getMultiAdapter
 

plone/app/contentrules/conditions/fileextension.py

@@ -13,12 +13,6 @@
 from zope.interface import Interface
 
 
-try:
-    from Products.ATContentTypes.interfaces import IFileContent
-except ImportError:
-    IFileContent = None
-
-
 class IFileExtensionCondition(Interface):
     """Interface for the configurable aspects of a portal type condition.
 
@@ -66,10 +60,6 @@ def __call__(self):
         if IFile.providedBy(obj):
             base_unit = getattr(obj, "file", None)
             name = getattr(base_unit, "filename", None)
-        elif IFileContent is None:
-            return False
-        elif not IFileContent.providedBy(obj):
-            return False
         else:
             base_unit = obj.getFile()
             get_filename = getattr(base_unit, "getFilename", None)

plone/app/contentrules/configure.zcml

@@ -27,18 +27,6 @@
         <implements interface="plone.contentrules.engine.interfaces.IRuleAssignable" />
     </class>
 
-    <configure zcml:condition="installed Products.ATContentTypes">
-
-      <class class="Products.ATContentTypes.content.folder.ATFolder">
-          <implements interface="plone.contentrules.engine.interfaces.IRuleAssignable" />
-      </class>
-
-      <class class="Products.ATContentTypes.content.folder.ATBTreeFolder">
-          <implements interface="plone.contentrules.engine.interfaces.IRuleAssignable" />
-      </class>
-
-    </configure>
-
     <!-- Let rules be annotatable - used to keep track of rule-to-assignment mappings -->
 
     <class class="plone.app.contentrules.rule.Rule">

plone/app/contentrules/tests/test_action_mail.py

@@ -1,17 +1,17 @@
 from Acquisition import aq_base
+from email import message_from_bytes
 from plone.app.contentrules.actions.mail import MailAction
 from plone.app.contentrules.actions.mail import MailAddFormView
 from plone.app.contentrules.actions.mail import MailEditFormView
 from plone.app.contentrules.rule import Rule
 from plone.app.contentrules.tests.base import ContentRulesTestCase
 from plone.app.testing import setRoles
 from plone.app.testing import TEST_USER_ID
+from plone.base.interfaces.controlpanel import IMailSchema
 from plone.contentrules.engine.interfaces import IRuleStorage
 from plone.contentrules.rule.interfaces import IExecutable
 from plone.contentrules.rule.interfaces import IRuleAction
 from plone.registry.interfaces import IRegistry
-from Products.CMFPlone.interfaces.controlpanel import IMailSchema
-from Products.CMFPlone.tests.utils import MockMailHost
 from Products.MailHost.interfaces import IMailHost
 from zope.component import getMultiAdapter
 from zope.component import getSiteManager
@@ -22,14 +22,6 @@
 import unittest
 
 
-try:
-    # Python 3
-    from email import message_from_bytes
-except ImportError:
-    # Python 2
-    from email import message_from_string as message_from_bytes
-
-
 @implementer(IObjectEvent)
 class DummyEvent:
     def __init__(self, object):

plone/app/contentrules/tests/test_handlers.py

@@ -36,21 +36,3 @@ def test_call_uuidaware(self):
         self.assertTrue(to_execute)
         to_execute = self.rulefilter(self.uuidaware, self.rule, self.event)
         self.assertTrue(not to_execute)
-
-    def test_delayed_events(self):
-        # many events can be delayed
-        # But this was only true for Archetypes content.
-        # The tests no use dexterity so we skip it:
-        return
-
-        self.portal.invokeFactory("Folder", "folder2")
-        event1 = dummy.DummyEvent(self.folder)
-        event2 = dummy.DummyEvent(self.portal.folder2)
-        from plone.app.contentrules.handlers import _status
-
-        _status.delayed_events = {}
-        handlers.added(event1)
-        handlers.added(event2)
-        from plone.app.contentrules.handlers import _status
-
-        self.assertEqual(len(_status.delayed_events), 2)