Merge 727be21 into 2dd5284

plone · Sep 2, 2020 · 2516c67 · 2516c67
2 parents 2dd5284 + 727be21
commit 2516c67
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/news/975.bugfix b/news/975.bugfix
@@ -0,0 +1,2 @@
+Fixed deprecation warnings for ``zope.site.hooks`` and ``CMFPlone.interfaces.ILanguageSchema``.
+[maurits]
diff --git a/src/plone/restapi/testing.py b/src/plone/restapi/testing.py
@@ -99,7 +99,12 @@ def enable_request_language_negotiation(portal):
     pieces of content in different languages.
     """
     if PLONE_5:
-        from Products.CMFPlone.interfaces import ILanguageSchema
+        try:
+            # Plone 5.2+
+            from plone.i18n.interfaces import ILanguageSchema
+        except ImportError:  # pragma: no cover
+            # Plone 5.0/5.1
+            from Products.CMFPlone.interfaces import ILanguageSchema
 
         registry = getUtility(IRegistry)
         settings = registry.forInterface(ILanguageSchema, prefix="plone")

diff --git a/src/plone/restapi/tests/test_documentation.py b/src/plone/restapi/tests/test_documentation.py
@@ -33,7 +33,7 @@
 from zope.component import createObject
 from zope.component import getUtility
 from zope.interface import alsoProvides
-from zope.site.hooks import getSite
+from zope.component.hooks import getSite
 
 import collections
 import json

diff --git a/src/plone/restapi/tests/test_serializer_summary.py b/src/plone/restapi/tests/test_serializer_summary.py
@@ -13,7 +13,7 @@
 from plone.restapi.testing import register_static_uuid_utility
 from Products.CMFCore.utils import getToolByName
 from zope.component import getMultiAdapter
-from zope.site.hooks import getSite
+from zope.component.hooks import getSite
 
 import Missing
 import unittest