Merge pull request #253 from plone/no-plone-api

Do not depend on plone.api

Author: ale-rt

news/188.bugfix.rst

@@ -0,0 +1 @@
+Do not depend on ``plone.api``. [ale-rt]

plone/app/discussion/upgrades.py

@@ -1,7 +1,6 @@
 from .interfaces import IDiscussionSettings
 from .setuphandlers import add_discussion_behavior_to_default_types
 from datetime import timezone
-from plone import api
 from plone.registry.interfaces import IRegistry
 from Products.CMFCore.utils import getToolByName
 from Products.ZCatalog.ProgressHandler import ZLogHandler
@@ -92,7 +91,7 @@ def extend_review_workflow(context):
 
 def set_timezone_on_dates(context):
     """Ensure timezone data is stored against all creation/modified dates"""
-    pc = api.portal.get_tool("portal_catalog")
+    pc = getToolByName(context, "portal_catalog")
     creations = 0
     modifieds = 0
     logger.info("Setting timezone information on comment dates")

setup.py

@@ -44,7 +44,6 @@
         "Products.GenericSetup",
         "Products.ZCatalog",
         "Products.statusmessages",
-        "plone.api",
         "plone.app.event",
         "plone.registry",
         "plone.resource",