[Checkins] SVN: zope.app.catalog/trunk/ Import hooks functionality from zope.component after it was moved there from

[Thomas Lotze]

Log message for revision 105852:
  Import hooks functionality from zope.component after it was moved there from
  zope.site. This lifts the test dependency on zope.site.
  

Changed:
  U   zope.app.catalog/trunk/CHANGES.txt
  U   zope.app.catalog/trunk/setup.py
  U   zope.app.catalog/trunk/src/zope/app/catalog/browser/README.txt

-=-
Modified: zope.app.catalog/trunk/CHANGES.txt
===================================================================
--- zope.app.catalog/trunk/CHANGES.txt	2009-11-19 07:19:32 UTC (rev 105851)
+++ zope.app.catalog/trunk/CHANGES.txt	2009-11-19 07:25:21 UTC (rev 105852)
@@ -8,6 +8,9 @@
 - Removed unneeded dependencies on zope.app.publisher and zope.app.form, moved
   zope.app.intid to the test dependencies.
 
+- Import hooks functionality from zope.component after it was moved there from
+  zope.site. This lifts the test dependency on zope.site.
+
 3.8.0 (2009-02-01)
 ------------------
 

Modified: zope.app.catalog/trunk/setup.py
===================================================================
--- zope.app.catalog/trunk/setup.py	2009-11-19 07:19:32 UTC (rev 105851)
+++ zope.app.catalog/trunk/setup.py	2009-11-19 07:25:21 UTC (rev 105852)
@@ -55,7 +55,6 @@
       extras_require = dict(
           test=['zope.testing',
                 'zope.component',
-                'zope.site',
                 'zope.app.intid',
                 'zope.app.securitypolicy',
                 'zope.app.testing',

Modified: zope.app.catalog/trunk/src/zope/app/catalog/browser/README.txt
===================================================================
--- zope.app.catalog/trunk/src/zope/app/catalog/browser/README.txt	2009-11-19 07:19:32 UTC (rev 105851)
+++ zope.app.catalog/trunk/src/zope/app/catalog/browser/README.txt	2009-11-19 07:25:21 UTC (rev 105852)
@@ -354,7 +354,7 @@
 We'll make our root folder the site (this would normally be done by
 the publisher):
 
-  >>> from zope.site.hooks import setSite
+  >>> from zope.component.hooks import setSite
   >>> setSite(root)
 
 Now, we'll get the catalog: