[Checkins] SVN: grokcore.site/trunk/ migrate imports from zope.app.component to zope.site

[Kevin Teague]

Log message for revision 106473:
  migrate imports from zope.app.component to zope.site

Changed:
  U   grokcore.site/trunk/CHANGES.txt
  U   grokcore.site/trunk/src/grokcore/site/ftests/utility/local.py
  U   grokcore.site/trunk/src/grokcore/site/ftests/utility/local_override.py
  U   grokcore.site/trunk/src/grokcore/site/ftests/utility/public.py
  U   grokcore.site/trunk/src/grokcore/site/ftests/utility/subclass.py
  U   grokcore.site/trunk/src/grokcore/site/subscriber.py

-=-
Modified: grokcore.site/trunk/CHANGES.txt
===================================================================
--- grokcore.site/trunk/CHANGES.txt	2009-12-13 21:20:33 UTC (rev 106472)
+++ grokcore.site/trunk/CHANGES.txt	2009-12-14 00:14:05 UTC (rev 106473)
@@ -4,7 +4,7 @@
 1.2 (unreleased)
 ----------------
 
-* ...
+* Migrated imports from zope.app.component to zope.site.
 
 1.1 (2009-09-18)
 ----------------

Modified: grokcore.site/trunk/src/grokcore/site/ftests/utility/local.py
===================================================================
--- grokcore.site/trunk/src/grokcore/site/ftests/utility/local.py	2009-12-13 21:20:33 UTC (rev 106472)
+++ grokcore.site/trunk/src/grokcore/site/ftests/utility/local.py	2009-12-14 00:14:05 UTC (rev 106473)
@@ -6,7 +6,7 @@
   >>> getRootFolder()["cave"] = cave
 
   >>> from zope import component
-  >>> from zope.app.component.hooks import getSite, setSite
+  >>> from zope.site.hooks import getSite, setSite
   >>> setSite(cave)
 
   >>> fireplace = component.getUtility(IFireplace)

Modified: grokcore.site/trunk/src/grokcore/site/ftests/utility/local_override.py
===================================================================
--- grokcore.site/trunk/src/grokcore/site/ftests/utility/local_override.py	2009-12-13 21:20:33 UTC (rev 106472)
+++ grokcore.site/trunk/src/grokcore/site/ftests/utility/local_override.py	2009-12-14 00:14:05 UTC (rev 106473)
@@ -6,7 +6,7 @@
   >>> getRootFolder()['cave'] = cave
 
   >>> from zope import component
-  >>> from zope.app.component.hooks import getSite, setSite
+  >>> from zope.site.hooks import getSite, setSite
   >>> setSite(cave)
 
   >>> club = component.getUtility(IClub)

Modified: grokcore.site/trunk/src/grokcore/site/ftests/utility/public.py
===================================================================
--- grokcore.site/trunk/src/grokcore/site/ftests/utility/public.py	2009-12-13 21:20:33 UTC (rev 106472)
+++ grokcore.site/trunk/src/grokcore/site/ftests/utility/public.py	2009-12-14 00:14:05 UTC (rev 106473)
@@ -8,7 +8,7 @@
   >>> getRootFolder()["cave"] = cave
 
   >>> from zope import component
-  >>> from zope.app.component.hooks import getSite, setSite
+  >>> from zope.site.hooks import getSite, setSite
   >>> setSite(cave)
   >>> cave['fireplace'] is component.getUtility(IFireplace)
   True

Modified: grokcore.site/trunk/src/grokcore/site/ftests/utility/subclass.py
===================================================================
--- grokcore.site/trunk/src/grokcore/site/ftests/utility/subclass.py	2009-12-13 21:20:33 UTC (rev 106472)
+++ grokcore.site/trunk/src/grokcore/site/ftests/utility/subclass.py	2009-12-14 00:14:05 UTC (rev 106473)
@@ -5,7 +5,7 @@
   >>> getRootFolder()["cave"] = cave
 
   >>> from zope import component
-  >>> from zope.app.component.hooks import getSite, setSite
+  >>> from zope.site.hooks import getSite, setSite
 
   >>> setSite(cave)
   >>> fireplace = component.getUtility(IFireplace)

Modified: grokcore.site/trunk/src/grokcore/site/subscriber.py
===================================================================
--- grokcore.site/trunk/src/grokcore/site/subscriber.py	2009-12-13 21:20:33 UTC (rev 106472)
+++ grokcore.site/trunk/src/grokcore/site/subscriber.py	2009-12-14 00:14:05 UTC (rev 106473)
@@ -13,7 +13,7 @@
 ##############################################################################
 
 from zope.lifecycleevent.interfaces import IObjectAddedEvent
-from zope.app.component.site import LocalSiteManager
+from zope.site import LocalSiteManager
 
 import grokcore.component
 from grokcore.site.components import Site