use zope.component.hooks not zope.site.hooks.

zopefoundation · Jan 10, 2018 · 762b651 · 762b651
1 parent 44b542f
commit 762b651
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -4,8 +4,8 @@ Changes
 3.0.2 (unreleased)
 ------------------
 
-- Nothing changed yet.
-
+- Do not import `getSite` from `zope.site.hooks` anymore but from
+  `zope.component.hooks.
 
 3.0.1 (2018-01-10)
 ------------------

diff --git a/src/grokcore/site/__init__.py b/src/grokcore/site/__init__.py
@@ -12,7 +12,7 @@
 #
 ##############################################################################
 
-from zope.site.hooks import getSite
+from zope.component.hooks import getSite
 from grokcore.component import *
 from grokcore.site.directive import site, local_utility, install_on
 from grokcore.site.components import Site, LocalUtility, Application

diff --git a/src/grokcore/site/ftests/utility/local.py b/src/grokcore/site/ftests/utility/local.py
@@ -6,7 +6,7 @@
   >>> getRootFolder()["cave"] = cave
 
   >>> from zope import component
-  >>> from zope.site.hooks import getSite, setSite
+  >>> from zope.component.hooks import getSite, setSite
   >>> setSite(cave)
 
   >>> fireplace = component.getUtility(IFireplace)

diff --git a/src/grokcore/site/ftests/utility/local_override.py b/src/grokcore/site/ftests/utility/local_override.py
@@ -6,7 +6,7 @@
   >>> getRootFolder()['cave'] = cave
 
   >>> from zope import component
-  >>> from zope.site.hooks import getSite, setSite
+  >>> from zope.component.hooks import getSite, setSite
   >>> setSite(cave)
 
   >>> club = component.getUtility(IClub)

diff --git a/src/grokcore/site/ftests/utility/public.py b/src/grokcore/site/ftests/utility/public.py
@@ -8,7 +8,7 @@
   >>> getRootFolder()["cave"] = cave
 
   >>> from zope import component
-  >>> from zope.site.hooks import getSite, setSite
+  >>> from zope.component.hooks import getSite, setSite
   >>> setSite(cave)
   >>> cave['fireplace'] is component.getUtility(IFireplace)
   True

diff --git a/src/grokcore/site/ftests/utility/subclass.py b/src/grokcore/site/ftests/utility/subclass.py
@@ -5,7 +5,7 @@
   >>> getRootFolder()["cave"] = cave
 
   >>> from zope import component
-  >>> from zope.site.hooks import getSite, setSite
+  >>> from zope.component.hooks import getSite, setSite
 
   >>> setSite(cave)
   >>> fireplace = component.getUtility(IFireplace)