[Zope-Checkins] SVN: Zope/trunk/src/ - updated imports

[Yvo Schubbe]

Log message for revision 124871:
  - updated imports

Changed:
  UU  Zope/trunk/src/Products/Five/component/__init__.py
  UU  Zope/trunk/src/Products/Five/component/browser.py
  U   Zope/trunk/src/Products/Five/component/makesite.txt
  UU  Zope/trunk/src/Testing/ZopeTestCase/functional.py

-=-
Modified: Zope/trunk/src/Products/Five/component/__init__.py
===================================================================
--- Zope/trunk/src/Products/Five/component/__init__.py	2012-04-02 06:20:12 UTC (rev 124870)
+++ Zope/trunk/src/Products/Five/component/__init__.py	2012-04-02 06:30:34 UTC (rev 124871)
@@ -28,7 +28,7 @@
 from ZPublisher.BeforeTraverse import unregisterBeforeTraverse
 
 # Hook up custom component architecture calls
-from zope.site.hooks import setHooks
+from zope.component.hooks import setHooks
 setHooks()
 
 def findSite(obj, iface=ISite):


Property changes on: Zope/trunk/src/Products/Five/component/__init__.py
___________________________________________________________________
Deleted: svn:keywords
   - Id

Modified: Zope/trunk/src/Products/Five/component/browser.py
===================================================================
--- Zope/trunk/src/Products/Five/component/browser.py	2012-04-02 06:20:12 UTC (rev 124870)
+++ Zope/trunk/src/Products/Five/component/browser.py	2012-04-02 06:30:34 UTC (rev 124871)
@@ -19,8 +19,8 @@
 from Products.Five.component.interfaces import IObjectManagerSite
 
 from zope.component.globalregistry import base
+from zope.component.hooks import setSite
 from zope.component.persistentregistry import PersistentComponents
-from zope.site.hooks import setSite
 
 
 class ObjectManagerSiteView(BrowserView):


Property changes on: Zope/trunk/src/Products/Five/component/browser.py
___________________________________________________________________
Deleted: svn:keywords
   - Id

Modified: Zope/trunk/src/Products/Five/component/makesite.txt
===================================================================
--- Zope/trunk/src/Products/Five/component/makesite.txt	2012-04-02 06:20:12 UTC (rev 124870)
+++ Zope/trunk/src/Products/Five/component/makesite.txt	2012-04-02 06:30:34 UTC (rev 124871)
@@ -18,7 +18,7 @@
 
 Enable local component lookup hooks:
 
-    >>> from zope.site.hooks import setHooks
+    >>> from zope.component.hooks import setHooks
     >>> setHooks()
 
 

Modified: Zope/trunk/src/Testing/ZopeTestCase/functional.py
===================================================================
--- Zope/trunk/src/Testing/ZopeTestCase/functional.py	2012-04-02 06:20:12 UTC (rev 124870)
+++ Zope/trunk/src/Testing/ZopeTestCase/functional.py	2012-04-02 06:30:34 UTC (rev 124871)
@@ -29,8 +29,8 @@
     '''
     from AccessControl.SecurityManagement import getSecurityManager
     from AccessControl.SecurityManagement import setSecurityManager
-    from zope.site.hooks import getSite
-    from zope.site.hooks import setSite
+    from zope.component.hooks import getSite
+    from zope.component.hooks import setSite
 
     def wrapped_func(*args, **kw):
         sm, site = getSecurityManager(), getSite()


Property changes on: Zope/trunk/src/Testing/ZopeTestCase/functional.py
___________________________________________________________________
Deleted: svn:keywords
   - Id