diff --git a/CHANGES.rst b/CHANGES.rst index 347d786..959ff6f 100644 --- 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 index 90e91cb..26aec2c 100644 --- 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 index e907046..68707dd 100644 --- 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