Remove long deprecated backward compatibility imports of getSite and …

…setHooks.
zopefoundation · Aug 10, 2020 · ae4ce17 · ae4ce17
1 parent 3363446
commit ae4ce17
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,6 +4,9 @@ Changes
 1.0.0 (unreleased)
 ------------------
 
+- Breaking: Remove long deprecated backward compatibility imports of getSite and setHooks.
+  [jensens]
+
 - Fix #8:  Broken on Windows (non case-sensitive filesystem).
   [jensens]
 

diff --git a/src/z3c/jbot/tests/test_five.py b/src/z3c/jbot/tests/test_five.py
@@ -36,10 +36,7 @@ class MockSite(object):
             REQUEST = TestRequest("en")
             getSiteManager = component.getSiteManager
 
-        try:
-            from zope.site.hooks import setHooks, setSite
-        except ImportError:
-            from zope.app.component.hooks import setHooks, setSite
+        from zope.component.hooks import setHooks, setSite
 
         setHooks()
         setSite(MockSite())

diff --git a/src/z3c/jbot/utility.py b/src/z3c/jbot/utility.py
@@ -1,15 +1,12 @@
 from z3c.jbot.interfaces import ITemplateManager
 from zope.component import getGlobalSiteManager
+from zope.component.hooks import getSite
 from zope.interface import Interface
 from zope.interface import providedBy
 from zope.publisher.interfaces import IRequest
 import zope.security.interfaces
 import zope.security.management
 
-try:
-    from zope.site.hooks import getSite
-except ImportError:
-    from zope.app.component.hooks import getSite
 
 try:
     import Acquisition  # noqa