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

[Thomas Lotze]

Log message for revision 105880:
  - Import hooks functionality from zope.component after it was moved there from
    zope.site.
  - Import ISite from zope.component after it was moved there from
    zope.location. This lifts the dependency on zope.location.
  

Changed:
  U   zope.app.appsetup/trunk/CHANGES.txt
  U   zope.app.appsetup/trunk/setup.py
  U   zope.app.appsetup/trunk/src/zope/app/appsetup/appsetup.py
  U   zope.app.appsetup/trunk/src/zope/app/appsetup/bootstrap.py

-=-
Modified: zope.app.appsetup/trunk/CHANGES.txt
===================================================================
--- zope.app.appsetup/trunk/CHANGES.txt	2009-11-19 14:56:47 UTC (rev 105879)
+++ zope.app.appsetup/trunk/CHANGES.txt	2009-11-19 15:37:49 UTC (rev 105880)
@@ -4,9 +4,13 @@
 3.12.1 (unreleased)
 -------------------
 
-- Nothing changed yet.
+- Import hooks functionality from zope.component after it was moved there from
+  zope.site.
 
+- Import ISite from zope.component after it was moved there from
+  zope.location. This lifts the dependency on zope.location.
 
+
 3.12.0 (2009-06-20)
 -------------------
 

Modified: zope.app.appsetup/trunk/setup.py
===================================================================
--- zope.app.appsetup/trunk/setup.py	2009-11-19 14:56:47 UTC (rev 105879)
+++ zope.app.appsetup/trunk/setup.py	2009-11-19 15:37:49 UTC (rev 105880)
@@ -75,7 +75,6 @@
                       'zope.error',
                       'zope.event',
                       'zope.interface',
-                      'zope.location',
                       'zope.processlifetime',
                       'zope.session',
                       'zope.site',

Modified: zope.app.appsetup/trunk/src/zope/app/appsetup/appsetup.py
===================================================================
--- zope.app.appsetup/trunk/src/zope/app/appsetup/appsetup.py	2009-11-19 14:56:47 UTC (rev 105879)
+++ zope.app.appsetup/trunk/src/zope/app/appsetup/appsetup.py	2009-11-19 15:37:49 UTC (rev 105880)
@@ -21,7 +21,7 @@
 import ZODB.interfaces
 import zope.interface
 import zope.component
-import zope.site.hooks
+import zope.component.hooks
 from zope.security.interfaces import IParticipation
 from zope.security.management import system_user
 import zope.processlifetime
@@ -101,7 +101,7 @@
     newInteraction(SystemConfigurationParticipation())
 
     # Hook up custom component architecture calls
-    zope.site.hooks.setHooks()
+    zope.component.hooks.setHooks()
 
     # Load server-independent site config
     context = config.ConfigurationMachine()

Modified: zope.app.appsetup/trunk/src/zope/app/appsetup/bootstrap.py
===================================================================
--- zope.app.appsetup/trunk/src/zope/app/appsetup/bootstrap.py	2009-11-19 14:56:47 UTC (rev 105879)
+++ zope.app.appsetup/trunk/src/zope/app/appsetup/bootstrap.py	2009-11-19 15:37:49 UTC (rev 105880)
@@ -24,13 +24,13 @@
 import logging
 import transaction
 import warnings
+import zope.component.interfaces
 import zope.event
 import zope.lifecycleevent
 import zope.processlifetime
 
 from zope.app.publication.zopepublication import ZopePublication
 from zope.container.interfaces import INameChooser
-from zope.location.interfaces import ISite
 from zope.security.management import getSecurityPolicy
 from zope.security.simplepolicies import ParanoidSecurityPolicy
 from zope.site import site
@@ -164,7 +164,7 @@
         root_folder = rootFolder()
         zope.event.notify(zope.lifecycleevent.ObjectCreatedEvent(root_folder))
         root[ZopePublication.root_name] = root_folder
-        if not ISite.providedBy(root_folder):
+        if not zope.component.interfaces.ISite.providedBy(root_folder):
             site_manager = site.LocalSiteManager(root_folder)
             root_folder.setSiteManager(site_manager)