Clean up

Backport some clean up from #592

Author: ale-rt

news/592.bugfix.md

@@ -0,0 +1 @@
+Clean up. @ale-rt

src/plone/api/content.py

@@ -21,11 +21,15 @@
 from zope.globalrequest import getRequest
 from zope.interface import Interface
 from zope.interface import providedBy
+from zope.interface.interface import InterfaceClass
+from ZPublisher.BaseRequest import RequestContainer
+from ZTUtils.Lazy import LazyCat
+from ZTUtils.Lazy import LazyMap
 
 import transaction
 import uuid
 
-_marker = []
+_marker = object()
 
 # Maximum number of attempts to generate a unique random ID
 MAX_UNIQUE_ID_ATTEMPTS = 100
@@ -753,7 +757,7 @@ def iter_ancestors(obj=None, function=None, interface=None, stop_at=_marker):
         #
         # This is useful if we want to have an empty iterator when checking
         # for ancestors in the portal.
-        return iter(())
+        yield from ()
 
     chain = aq_chain(aq_inner(obj))
 

src/plone/api/portal.py

@@ -170,11 +170,6 @@ def send_email(
             # formataddr probably got confused by special characters.
             sender = from_address
 
-    # If the mail headers are not properly encoded we need to extract
-    # them and let MailHost manage the encoding.
-    if isinstance(body, str):
-        body = body.encode(encoding)
-
     host = get_tool("MailHost")
     host.send(
         body,

src/plone/api/tests/test_portal.py

@@ -15,24 +15,18 @@
 from Products.CMFPlone.tests.utils import MockMailHost
 from Products.MailHost.interfaces import IMailHost
 from unittest import mock
+from unittest.mock import MagicMock
 from zope import schema
 from zope.component import getUtility
 from zope.component.hooks import setSite
 from zope.interface import Interface
 from zope.schema.vocabulary import SimpleVocabulary
 from zope.site import LocalSiteManager
+from ZPublisher.HTTPRequest import HTTPRequest
 
 import DateTime
 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
-
-
 HAS_PLONE5 = version.parse(env.plone_version()) >= version.parse("5.0b2")
 
 

src/plone/api/user.py

@@ -438,9 +438,12 @@ def revoke_roles(username=None, user=None, obj=None, roles=None):
     if user is None:
         raise InvalidParameterError("User could not be found")
 
-    roles = set(roles)
+    if not isinstance(roles, (list, tuple)):
+        raise InvalidParameterError("Roles must be a list or a tuple of strings")
 
-    if "Anonymous" in roles or "Authenticated" in roles:
+    roles_set = set(roles)
+
+    if "Anonymous" in roles_set or "Authenticated" in roles_set:
         raise InvalidParameterError
 
     inherit = True
@@ -454,7 +457,7 @@ def revoke_roles(username=None, user=None, obj=None, roles=None):
         if role not in ["Anonymous", "Authenticated"]
     }
 
-    roles = list(actual_roles - roles)
+    roles = list(actual_roles - roles_set)
 
     if obj is None:
         user.setSecurityProfile(roles=roles)