Merge pull request #4 from zopefoundation/jw-zope.component.hooks

use zope.component.hooks not zope.site.hooks.
zopefoundation · Jan 11, 2018 · 5fe2686 · 5fe2686
2 parents 44b542f + d7c224a
commit 5fe2686
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 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/application/application.py b/src/grokcore/site/ftests/application/application.py
@@ -10,12 +10,12 @@
 Let's create an application, then get it using grok.getApplication():
 
   >>> import grokcore.site
-  >>> import zope.site.hooks
+  >>> import zope.component.hooks
   >>> root = getRootFolder()
 
   >>> app = grokcore.site.util.create_application(Cave, root, 'mycave')
   >>> root['cave'] = app
-  >>> zope.site.hooks.setSite(app)
+  >>> zope.component.hooks.setSite(app)
   >>> grokcore.site.getApplication()
   <grokcore.site.ftests.application.application.Cave object at ...>
 
@@ -29,7 +29,7 @@
 we'll get the box:
 
   >>> root['cave']['box'] = WoodBox()
-  >>> zope.site.hooks.setSite(root['cave']['box'])
+  >>> zope.component.hooks.setSite(root['cave']['box'])
   >>> getSite()
   <grokcore.site.ftests.application.application.WoodBox object at ...>
 

diff --git a/src/grokcore/site/ftests/utility/install_on.py b/src/grokcore/site/ftests/utility/install_on.py
@@ -6,7 +6,7 @@
   >>> getRootFolder()['cave'] = cave
 
   >>> from zope.component import queryUtility
-  >>> from zope.site.hooks import setSite
+  >>> from zope.component.hooks import setSite
   >>> from zope.event import notify
   >>> setSite(cave)
 

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)